B.A.T.M.A.N April 2013

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

14 participants
76 discussions

[B.A.T.M.A.N.] [PATCH 0/3] introduce the SYNCHRONIZED TT flags
by Antonio Quartulli 23 Apr '13

23 Apr '13

Some TT flags can change at runtime and for this reason all the nodes in the mesh network must track and possibly update them. An existing example is the Wifi flag. This patchset introduces all those needed changes in order to synchronize client flags that requires such treatment. Cheers, This code is based on top of ordex/tt-vlan Antonio Quartulli (3): batman-adv: invoke dev_get_by_index() outside of is_wifi_iface() batman-adv: improve TT component to support runtime flag changes batman-adv: compute the global/local table CRC using the synch flags hard-interface.c | 33 ++++----------------------------- hard-interface.h | 2 +- packet.h | 14 +++++++++++++- translation-table.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 67 insertions(+), 32 deletions(-) -- 1.8.1.5

1 3

[B.A.T.M.A.N.] [PATCH 0/3] Fragmentation version 2
by Martin Hundebøll 23 Apr '13

23 Apr '13

These are a few patches to remove the current fragmentation code and replace it with a new version that supports more packet types and more fragments per packet, thus allowing bigger payloads. The patches are based on simon "bigbump" repo and are meant for the next big bump in compat number. Martin Hundebøll (3): batman-adv: Remove old fragmentation code batman-adv: Receive fragmented packets and merge batman-adv: Fragment and send skbs larger than mtu Makefile.kbuild | 2 +- distributed-arp-table.c | 11 +- fragmentation.c | 493 ++++++++++++++++++++++++++++++++++++++++++++++++ fragmentation.h | 34 ++++ hard-interface.c | 1 - main.c | 7 +- main.h | 4 + originator.c | 18 +- packet.h | 32 ++-- routing.c | 145 ++++++-------- routing.h | 4 +- send.c | 194 ++++++++++++++++++- send.h | 36 ++++ soft-interface.c | 15 +- types.h | 55 ++++-- unicast.c | 478 ---------------------------------------------- unicast.h | 92 --------- 17 files changed, 904 insertions(+), 717 deletions(-) create mode 100644 fragmentation.c create mode 100644 fragmentation.h delete mode 100644 unicast.c delete mode 100644 unicast.h -- 1.8.2.1

3 9

[B.A.T.M.A.N.] [PATCH] Added generic transformer to string function for DAT data
by YourName 23 Apr '13

23 Apr '13

Signed-off-by: Mihail Costea <mihail.costea90(a)gmail.com> Signed-off-by: Stefan Popa <Stefan.A.Popa(a)intel.com> Reviewed-by: Stefan Popa <Stefan.A.Popa(a)intel.com> --- distributed-arp-table.c | 71 +++++++++++++++++++++++++++++++++++++++++------ types.h | 8 ++++++ 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 3a3e1d8..5df8f19 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -34,6 +34,36 @@ static void batadv_dat_purge(struct work_struct *work); /** + * batadv_dat_data_to_str: transforms DAT data to string + * @data: the DAT data + * @type: type of data + * + * Returns the string representation of data. This should be freed with kfree. + */ +static char *batadv_dat_data_to_str(void *data, uint8_t type) +{ + size_t buf_size; + char *buf, *format_type, ipv4[] = "%pI4"; + + switch (type) { + case BATADV_DAT_IPV4: + /* maximum length for an IPv4 string representation + NULL */ + buf_size = 16; + format_type = ipv4; + break; + default: + return NULL; + } + + buf = kmalloc(buf_size, GFP_ATOMIC); + if (!buf) + return NULL; + snprintf(buf, buf_size, format_type, data); + + return buf; +} + +/** * batadv_dat_start_timer - initialise the DAT periodic worker * @bat_priv: the bat priv with all the soft interface information */ @@ -272,6 +302,7 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, { struct batadv_dat_entry *dat_entry; int hash_added; + char *dbg_data; dat_entry = batadv_dat_entry_hash_find(bat_priv, ip); /* if this entry is already known, just update it */ @@ -279,9 +310,15 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, if (!batadv_compare_eth(dat_entry->mac_addr, mac_addr)) memcpy(dat_entry->mac_addr, mac_addr, ETH_ALEN); dat_entry->last_update = jiffies; - batadv_dbg(BATADV_DBG_DAT, bat_priv, - "Entry updated: %pI4 %pM\n", &dat_entry->ip, - dat_entry->mac_addr); + + dbg_data = batadv_dat_data_to_str(&dat_entry->ip, + BATADV_DAT_IPV4); + if (dbg_data) { + batadv_dbg(BATADV_DBG_DAT, bat_priv, + "Entry updated: %s %pM\n", dbg_data, + dat_entry->mac_addr); + kfree(dbg_data); + } goto out; } @@ -304,8 +341,13 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, goto out; } - batadv_dbg(BATADV_DBG_DAT, bat_priv, "New entry added: %pI4 %pM\n", - &dat_entry->ip, dat_entry->mac_addr); + dbg_data = batadv_dat_data_to_str(&dat_entry->ip, BATADV_DAT_IPV4); + if (dbg_data) { + batadv_dbg(BATADV_DBG_DAT, bat_priv, + "New entry added: %s %pM\n", dbg_data, + dat_entry->mac_addr); + kfree(dbg_data); + } out: if (dat_entry) @@ -527,6 +569,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) int select; batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key; struct batadv_dat_candidate *res; + char *dbg_data; if (!bat_priv->orig_hash) return NULL; @@ -538,9 +581,13 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) ip_key = (batadv_dat_addr_t)batadv_hash_dat(&ip_dst, BATADV_DAT_ADDR_MAX); - batadv_dbg(BATADV_DBG_DAT, bat_priv, - "dat_select_candidates(): IP=%pI4 hash(IP)=%u\n", &ip_dst, - ip_key); + dbg_data = batadv_dat_data_to_str(&ip_dst, BATADV_DAT_IPV4); + if (dbg_data) { + batadv_dbg(BATADV_DBG_DAT, bat_priv, + "dat_select_candidates(): IP=%s hash(IP)=%u\n", + dbg_data, ip_key); + kfree(dbg_data); + } for (select = 0; select < BATADV_DAT_CANDIDATES_NUM; select++) batadv_choose_next_candidate(bat_priv, res, select, ip_key, @@ -572,12 +619,18 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, struct batadv_neigh_node *neigh_node = NULL; struct sk_buff *tmp_skb; struct batadv_dat_candidate *cand; + char *dbg_data; cand = batadv_dat_select_candidates(bat_priv, ip); if (!cand) goto out; - batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip); + dbg_data = batadv_dat_data_to_str(&ip, BATADV_DAT_IPV4); + if (dbg_data) { + batadv_dbg(BATADV_DBG_DAT, bat_priv, + "DHT_SEND for %s\n", dbg_data); + kfree(dbg_data); + } for (i = 0; i < BATADV_DAT_CANDIDATES_NUM; i++) { if (cand[i].type == BATADV_DAT_CANDIDATE_NOT_FOUND) diff --git a/types.h b/types.h index b2c94e1..3488528 100644 --- a/types.h +++ b/types.h @@ -980,6 +980,14 @@ struct batadv_dat_entry { }; /** + * batadv_dat_types - types used in batadv_dat_entry for IP + * @BATADV_DAT_IPv4: IPv4 address type + */ +enum batadv_dat_types { + BATADV_DAT_IPV4, +}; + +/** * struct batadv_dat_candidate - candidate destination for DAT operations * @type: the type of the selected candidate. It can one of the following: * - BATADV_DAT_CANDIDATE_NOT_FOUND -- 1.7.10.4

3 3

[B.A.T.M.A.N.] batman-adv merge-conflict
by Antonio Quartulli 23 Apr '13

23 Apr '13

Hi David, here are the instructions to resolve the conflicts you will get while merging net into net-next. In net/batman-adv/routing.c ++<<<<<<< HEAD +static int batadv_check_unicast_packet(struct sk_buff *skb, int hdr_size) ++======= + static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, + struct sk_buff *skb, int hdr_size) ++>>>>>>> maint Resolves as: /** * batadv_check_unicast_packet - Check for malformed unicast packets * @skb: packet to check * @hdr_size: size of header to pull * * Check for short header and bad addresses in given packet. Returns negative * value when check fails and 0 otherwise. The negative value depends on the * reason: -ENODATA for bad header, -EBADR for broadcast destination or source, * and -EREMOTE for non-local (other host) destination. */ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, int hdr_size) =============================================================================== ++<<<<<<< HEAD + if (!batadv_is_my_mac(ethhdr->h_dest)) + return -EREMOTE; ++======= + if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest)) + return -1; ++>>>>>>> maint Resolves as: if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest)) return -EREMOTE; =============================================================================== ++<<<<<<< HEAD + /* function returns -EREMOTE for promiscuous packets */ + check = batadv_check_unicast_packet(skb, hdr_size); + + /* Even though the packet is not for us, we might save it to use for + * decoding a later received coded packet + */ + if (check == -EREMOTE) + batadv_nc_skb_store_sniffed_unicast(bat_priv, skb); + + if (check < 0) ++======= + if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0) ++>>>>>>> maint Resolves as: /* function returns -EREMOTE for promiscuous packets */ check = batadv_check_unicast_packet(bat_priv, skb, hdr_size); /* Even though the packet is not for us, we might save it to use for * decoding a later received coded packet */ if (check == -EREMOTE) batadv_nc_skb_store_sniffed_unicast(bat_priv, skb); if (check < 0) =============================================================================== I'm now going to send a pull request to fix some compile issues generated by the merge. Cheers, -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara

2 2

[B.A.T.M.A.N.] [PATCH net-next 0/2] batman-adv: fixes for net-next
by Antonio Quartulli 23 Apr '13

23 Apr '13

Hello David, here you have two fixes for net-next. One is fixing the compile issues introduced by the merge of net into net-next and one is fixing a bug in a component existing in net-next only. I'm not sending a pull request because I'm anticipating your merge of net into net-next and so I don't have a base point. I hope it is fine with you. Thanks a lot, Antonio Antonio Quartulli (2): batman-adv: fix batadv_is_my_mac() usage batman-adv: fix global protection fault during soft_iface destruction net/batman-adv/main.c | 6 ++++++ net/batman-adv/network-coding.c | 18 ++++++++++-------- net/batman-adv/routing.c | 1 + net/batman-adv/soft-interface.c | 7 +++++++ 4 files changed, 24 insertions(+), 8 deletions(-) -- 1.8.1.5

2 3

[B.A.T.M.A.N.] [RFCv3] batman-adv: Modified DAT structures and functions in order to support both IPv4 and IPv6
by Mihail Costea 20 Apr '13

20 Apr '13

Subject: [RFCv3] batman-adv: Modified DAT structures and functions in order to support both IPv4 and IPv6 Signed-off-by: Mihail Costea <mihail.costea90(a)gmail.com> Signed-off-by: Stefan Popa <Stefan.A.Popa(a)intel.com> Reviewed-by: Stefan Popa <Stefan.A.Popa(a)intel.com> --- Removed the ugly debug function with 2 macros (one is to test if IPV6 is enabled). I'm open the better ideas (the debug macro is used in 4 places to reduce switch-cases). Changed "if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)" to "if IS_ENABLED(CONFIG_IPV6)". Changed batadv_dat_entry ip member from unsigned char * to void * and renamed it to data. Use only one batadv_compare_dat function. distributed-arp-table.c | 255 +++++++++++++++++++++++++++++++++++++---------- types.h | 24 ++++- 2 files changed, 224 insertions(+), 55 deletions(-) diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 3a3e1d8..5936563 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -20,6 +20,7 @@ #include <linux/if_ether.h> #include <linux/if_arp.h> #include <net/arp.h> +#include <net/ipv6.h> #include "main.h" #include "hash.h" @@ -31,6 +32,61 @@ #include "translation-table.h" #include "unicast.h" +#ifdef CONFIG_BATMAN_ADV_DEBUG + +#if IS_ENABLED(CONFIG_IPV6) + +/* batadv_dat_dbg_ip - print similar debug message for IPv4 and IPv6. + * @bat_priv: the bat priv with all the soft interface information + * @ip_type: IPv4 / IPv6 address + * @format_prefix: format before IP field + * @format_suffix: format after IP field + * + * At list one variable parameter should be the IP itself, and it should + * be placed correctly based on format prefix and format suffix arguments. + */ +#define batadv_dat_dbg_ip(bat_priv, ip_type, format_prefix, \ + format_suffix, ...) \ + { \ + switch (ip_type) { \ + case BATADV_DAT_IPV4: \ + batadv_dbg(BATADV_DBG_DAT, bat_priv, \ + format_prefix "%pI4" format_suffix, \ + __VA_ARGS__); \ + break; \ + case BATADV_DAT_IPV6: \ + batadv_dbg(BATADV_DBG_DAT, bat_priv, \ + format_prefix "%pI6c" format_suffix, \ + __VA_ARGS__); \ + break; \ + } \ + } + +#else + +#define batadv_dat_dbg_ip(bat_priv, ip_type, format_prefix, \ + format_suffix, ...) \ + { \ + switch (ip_type) { \ + case BATADV_DAT_IPV4: \ + batadv_dbg(BATADV_DBG_DAT, bat_priv, \ + format_prefix "%pI4" format_suffix, \ + __VA_ARGS__); \ + break; \ + } \ + } +#endif + +#else + +static void batadv_dat_dbg_ip(struct batadv_priv *bat_priv, + uint8_t ip_type, char *format_prefix, + char *format_suffix, ...) +{ +} + +#endif /* CONFIG_BATMAN_ADV_DEBUG */ + static void batadv_dat_purge(struct work_struct *work); /** @@ -45,6 +101,19 @@ static void batadv_dat_start_timer(struct batadv_priv *bat_priv) } /** + * batadv_dat_entry_free_ref_rcu - free a dat entry using its rcu + * @rcu: the dat entry rcu + */ +static void batadv_dat_entry_free_ref_rcu(struct rcu_head *rcu) +{ + struct batadv_dat_entry *dat_entry; + + dat_entry = container_of(rcu, struct batadv_dat_entry, rcu); + kfree(dat_entry->data); + kfree(dat_entry); +} + +/** * batadv_dat_entry_free_ref - decrement the dat_entry refcounter and possibly * free it * @dat_entry: the entry to free @@ -52,7 +121,7 @@ static void batadv_dat_start_timer(struct batadv_priv *bat_priv) static void batadv_dat_entry_free_ref(struct batadv_dat_entry *dat_entry) { if (atomic_dec_and_test(&dat_entry->refcount)) - kfree_rcu(dat_entry, rcu); + call_rcu(&dat_entry->rcu, batadv_dat_entry_free_ref_rcu); } /** @@ -130,6 +199,26 @@ static void batadv_dat_purge(struct work_struct *work) } /** + * batadv_sizeof_ip - get sizeof IP based on its type (IPv4 / IPv6) + * @ip_type: type of IP address + * + * Returns sizeof IP, or sizeof IPv4 if ip_type is invalid. + */ +static size_t batadv_sizeof_ip(uint8_t ip_type) +{ + switch (ip_type) { + case BATADV_DAT_IPV4: + return sizeof(__be32); +#if IS_ENABLED(CONFIG_IPV6) + case BATADV_DAT_IPV6: + return sizeof(struct in6_addr); +#endif + default: + return sizeof(__be32); /* fallback to IPv4 */ + } +} + +/** * batadv_compare_dat - comparing function used in the local DAT hash table * @node: node in the local table * @data2: second object to compare the node to @@ -138,10 +227,18 @@ static void batadv_dat_purge(struct work_struct *work) */ static int batadv_compare_dat(const struct hlist_node *node, const void *data2) { - const void *data1 = container_of(node, struct batadv_dat_entry, - hash_entry); + struct batadv_dat_entry *dat_entry1 = container_of(node, + struct batadv_dat_entry, hash_entry); + struct batadv_dat_entry *dat_entry2 = container_of(data2, + struct batadv_dat_entry, data); + size_t ip_size; - return (memcmp(data1, data2, sizeof(__be32)) == 0 ? 1 : 0); + if (dat_entry1->type != dat_entry2->type) + return 0; + + ip_size = batadv_sizeof_ip(dat_entry1->type); + return (memcmp(dat_entry1->data, dat_entry2->data, + ip_size) == 0 ? 1 : 0); } /** @@ -201,16 +298,19 @@ static __be32 batadv_arp_ip_dst(struct sk_buff *skb, int hdr_size) * batadv_hash_dat - compute the hash value for an IP address * @data: data to hash * @size: size of the hash table + * @ip_type: type of IP address * * Returns the selected index in the hash table for the given data. */ -static uint32_t batadv_hash_dat(const void *data, uint32_t size) +static uint32_t batadv_hash_dat(const void *data, uint32_t size, + uint8_t ip_type) { const unsigned char *key = data; uint32_t hash = 0; - size_t i; + size_t i, ip_size; - for (i = 0; i < 4; i++) { + ip_size = batadv_sizeof_ip(ip_type); + for (i = 0; i < ip_size; i++) { hash += key[i]; hash += (hash << 10); hash ^= (hash >> 6); @@ -223,31 +323,47 @@ static uint32_t batadv_hash_dat(const void *data, uint32_t size) return hash % size; } +static uint32_t batadv_hash_dat_ipv4(const void *data, uint32_t size) +{ + return batadv_hash_dat(data, size, BATADV_DAT_IPV4); +} + +#if IS_ENABLED(CONFIG_IPV6) +static uint32_t batadv_hash_dat_ipv6(const void *data, uint32_t size) +{ + return batadv_hash_dat(data, size, BATADV_DAT_IPV6); +} +#endif + /** * 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 + * @ip_type: type of IP address * * 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) +batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, void *ip, + uint8_t ip_type) { struct hlist_head *head; struct batadv_dat_entry *dat_entry, *dat_entry_tmp = NULL; struct batadv_hashtable *hash = bat_priv->dat.hash; uint32_t index; + size_t ip_size; if (!hash) return NULL; - index = batadv_hash_dat(&ip, hash->size); + ip_size = batadv_sizeof_ip(ip_type); + index = batadv_hash_dat(ip, hash->size, ip_type); head = &hash->table[index]; rcu_read_lock(); hlist_for_each_entry_rcu(dat_entry, head, hash_entry) { - if (dat_entry->ip != ip) + if (memcmp(dat_entry->data, ip, ip_size)) continue; if (!atomic_inc_not_zero(&dat_entry->refcount)) @@ -264,24 +380,28 @@ batadv_dat_entry_hash_find(struct batadv_priv *bat_priv, __be32 ip) /** * batadv_dat_entry_add - add a new dat entry or update it if already exists * @bat_priv: the bat priv with all the soft interface information - * @ip: ipv4 to add/edit + * @ip: IP to add/edit + * @ip_type: type of IP address * @mac_addr: mac address to assign to the given ipv4 */ -static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, - uint8_t *mac_addr) +static void batadv_dat_entry_add(struct batadv_priv *bat_priv, void *ip, + uint8_t ip_type, uint8_t *mac_addr) { struct batadv_dat_entry *dat_entry; int hash_added; + size_t ip_size; + batadv_hashdata_choose_cb choose; - dat_entry = batadv_dat_entry_hash_find(bat_priv, ip); + dat_entry = batadv_dat_entry_hash_find(bat_priv, ip, ip_type); /* if this entry is already known, just update it */ if (dat_entry) { if (!batadv_compare_eth(dat_entry->mac_addr, mac_addr)) memcpy(dat_entry->mac_addr, mac_addr, ETH_ALEN); dat_entry->last_update = jiffies; - batadv_dbg(BATADV_DBG_DAT, bat_priv, - "Entry updated: %pI4 %pM\n", &dat_entry->ip, - dat_entry->mac_addr); + + batadv_dat_dbg_ip(bat_priv, ip_type, "Entry updated: ", + " %pM\n", dat_entry->data, + dat_entry->mac_addr); goto out; } @@ -289,13 +409,30 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, if (!dat_entry) goto out; - dat_entry->ip = ip; + ip_size = batadv_sizeof_ip(ip_type); + dat_entry->data = kmalloc(ip_size, GFP_ATOMIC); + if (!dat_entry->data) + goto out; + memcpy(dat_entry->data, ip, ip_size); + dat_entry->type = ip_type; + memcpy(dat_entry->mac_addr, mac_addr, ETH_ALEN); dat_entry->last_update = jiffies; atomic_set(&dat_entry->refcount, 2); + switch (ip_type) { +#if IS_ENABLED(CONFIG_IPV6) + case BATADV_DAT_IPV6: + choose = batadv_hash_dat_ipv6; + break; +#endif + default: + choose = batadv_hash_dat_ipv4; /* IPv4 by default */ + break; + } + hash_added = batadv_hash_add(bat_priv->dat.hash, batadv_compare_dat, - batadv_hash_dat, &dat_entry->ip, + choose, dat_entry->data, &dat_entry->hash_entry); if (unlikely(hash_added != 0)) { @@ -304,9 +441,8 @@ static void batadv_dat_entry_add(struct batadv_priv *bat_priv, __be32 ip, goto out; } - batadv_dbg(BATADV_DBG_DAT, bat_priv, "New entry added: %pI4 %pM\n", - &dat_entry->ip, dat_entry->mac_addr); - + batadv_dat_dbg_ip(bat_priv, ip_type, "New entry added: ", " %pM\n", + dat_entry->data, dat_entry->mac_addr); out: if (dat_entry) batadv_dat_entry_free_ref(dat_entry); @@ -513,7 +649,8 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, * 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 + * @ip_dst: IP to look up in the DHT + * @ip_type: type of IP address * * An originator O is selected if and only if its DHT_ID value is one of three * closest values (from the LEFT, with wrap around if needed) then the hash @@ -522,7 +659,8 @@ static void batadv_choose_next_candidate(struct batadv_priv *bat_priv, * 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) +batadv_dat_select_candidates(struct batadv_priv *bat_priv, void *ip_dst, + uint8_t ip_type) { int select; batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key; @@ -535,12 +673,11 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) if (!res) return NULL; - ip_key = (batadv_dat_addr_t)batadv_hash_dat(&ip_dst, - BATADV_DAT_ADDR_MAX); + ip_key = (batadv_dat_addr_t)batadv_hash_dat(ip_dst, BATADV_DAT_ADDR_MAX, + ip_type); - batadv_dbg(BATADV_DBG_DAT, bat_priv, - "dat_select_candidates(): IP=%pI4 hash(IP)=%u\n", &ip_dst, - ip_key); + batadv_dat_dbg_ip(bat_priv, ip_type, "dat_select_candidates(): IP=", + " hash(IP)=%u\n", ip_dst, ip_key); for (select = 0; select < BATADV_DAT_CANDIDATES_NUM; select++) batadv_choose_next_candidate(bat_priv, res, select, ip_key, @@ -554,6 +691,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) * @bat_priv: the bat priv with all the soft interface information * @skb: payload to send * @ip: the DHT key + * @ip_type: type of IP address * @packet_subtype: unicast4addr packet subtype to use * * This function copies the skb with pskb_copy() and is sent as unicast packet @@ -563,7 +701,7 @@ batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) * otherwise. */ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, - struct sk_buff *skb, __be32 ip, + struct sk_buff *skb, void *ip, uint8_t ip_type, int packet_subtype) { int i; @@ -573,11 +711,11 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, struct sk_buff *tmp_skb; struct batadv_dat_candidate *cand; - cand = batadv_dat_select_candidates(bat_priv, ip); + cand = batadv_dat_select_candidates(bat_priv, ip, ip_type); if (!cand) goto out; - batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip); + batadv_dat_dbg_ip(bat_priv, ip_type, "DHT_SEND for ", "\n", ip); for (i = 0; i < BATADV_DAT_CANDIDATES_NUM; i++) { if (cand[i].type == BATADV_DAT_CANDIDATE_NOT_FOUND) @@ -693,8 +831,8 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) goto out; seq_printf(seq, "Distributed ARP Table (%s):\n", net_dev->name); - seq_printf(seq, " %-7s %-13s %5s\n", "IPv4", "MAC", - "last-seen"); + seq_printf(seq, " %-26s %-15s %5s\n", + "IPv4/IPv6", "MAC", "last-seen"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -707,9 +845,20 @@ int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset) last_seen_msecs = last_seen_msecs % 60000; last_seen_secs = last_seen_msecs / 1000; - seq_printf(seq, " * %15pI4 %14pM %6i:%02i\n", - &dat_entry->ip, dat_entry->mac_addr, - last_seen_mins, last_seen_secs); + switch (dat_entry->type) { + case BATADV_DAT_IPV4: + seq_printf(seq, " * %-40pI4 %15pM %6i:%02i\n", + dat_entry->data, dat_entry->mac_addr, + last_seen_mins, last_seen_secs); + break; +#if IS_ENABLED(CONFIG_IPV6) + case BATADV_DAT_IPV6: + seq_printf(seq, " * %-40pI6c %15pM %6i:%02i\n", + dat_entry->data, dat_entry->mac_addr, + last_seen_mins, last_seen_secs); + break; +#endif + } } rcu_read_unlock(); } @@ -830,9 +979,10 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, hw_src = batadv_arp_hw_src(skb, 0); ip_dst = batadv_arp_ip_dst(skb, 0); - batadv_dat_entry_add(bat_priv, ip_src, hw_src); + batadv_dat_entry_add(bat_priv, &ip_src, BATADV_DAT_IPV4, hw_src); - dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst); + dat_entry = batadv_dat_entry_hash_find(bat_priv, &ip_dst, + BATADV_DAT_IPV4); if (dat_entry) { skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, bat_priv->soft_iface, ip_dst, hw_src, @@ -851,8 +1001,9 @@ 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 to the DHT */ - ret = batadv_dat_send_data(bat_priv, skb, ip_dst, + /* Send the request on the DHT */ + ret = batadv_dat_send_data(bat_priv, skb, &ip_dst, + BATADV_DAT_IPV4, BATADV_P_DAT_DHT_GET); } out: @@ -895,9 +1046,10 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv, batadv_dbg_arp(bat_priv, skb, type, hdr_size, "Parsing incoming ARP REQUEST"); - batadv_dat_entry_add(bat_priv, ip_src, hw_src); + batadv_dat_entry_add(bat_priv, &ip_src, BATADV_DAT_IPV4, hw_src); - dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst); + dat_entry = batadv_dat_entry_hash_find(bat_priv, &ip_dst, + BATADV_DAT_IPV4); if (!dat_entry) goto out; @@ -956,14 +1108,16 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, hw_dst = batadv_arp_hw_dst(skb, 0); ip_dst = batadv_arp_ip_dst(skb, 0); - batadv_dat_entry_add(bat_priv, ip_src, hw_src); - batadv_dat_entry_add(bat_priv, ip_dst, hw_dst); + batadv_dat_entry_add(bat_priv, &ip_src, BATADV_DAT_IPV4, hw_src); + batadv_dat_entry_add(bat_priv, &ip_dst, BATADV_DAT_IPV4, hw_dst); /* Send the ARP reply to the candidates for both the IP addresses that * 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); + batadv_dat_send_data(bat_priv, skb, &ip_src, BATADV_DAT_IPV4, + BATADV_P_DAT_DHT_PUT); + batadv_dat_send_data(bat_priv, skb, &ip_dst, BATADV_DAT_IPV4, + BATADV_P_DAT_DHT_PUT); } /** * batadv_dat_snoop_incoming_arp_reply - snoop the ARP reply and fill the local @@ -998,8 +1152,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, /* Update our internal cache with both the IP addresses the node got * within the ARP reply */ - batadv_dat_entry_add(bat_priv, ip_src, hw_src); - batadv_dat_entry_add(bat_priv, ip_dst, hw_dst); + batadv_dat_entry_add(bat_priv, &ip_src, BATADV_DAT_IPV4, hw_src); + batadv_dat_entry_add(bat_priv, &ip_dst, BATADV_DAT_IPV4, hw_dst); /* if this REPLY is directed to a client of mine, let's deliver the * packet to the interface @@ -1043,7 +1197,8 @@ bool batadv_dat_drop_broadcast_packet(struct batadv_priv *bat_priv, goto out; ip_dst = batadv_arp_ip_dst(forw_packet->skb, bcast_len); - dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_dst); + dat_entry = batadv_dat_entry_hash_find(bat_priv, &ip_dst, + BATADV_DAT_IPV4); /* check if the node already got this entry */ if (!dat_entry) { batadv_dbg(BATADV_DBG_DAT, bat_priv, diff --git a/types.h b/types.h index 5f542bd..5b820f6 100644 --- a/types.h +++ b/types.h @@ -961,17 +961,19 @@ struct batadv_algo_ops { }; /** - * struct batadv_dat_entry - it is a single entry of batman-adv ARP backend. It - * is used to stored ARP entries needed for the global DAT cache - * @ip: the IPv4 corresponding to this DAT/ARP entry - * @mac_addr: the MAC address associated to the stored IPv4 + * struct batadv_dat_entry - it is a single entry of batman-adv ARP/NDP backend. It + * is used to stored ARP/NDP entries needed for the global DAT cache + * @data: the data corresponding to this DAT ARP/NDP entry + * @type: the type corresponding to this DAT ARP/NDP entry + * @mac_addr: the MAC address associated to the stored data * @last_update: time in jiffies when this entry was refreshed last time * @hash_entry: hlist node for batadv_priv_dat::hash * @refcount: number of contexts the object is used * @rcu: struct used for freeing in an RCU-safe manner */ struct batadv_dat_entry { - __be32 ip; + void *data; + uint8_t type; uint8_t mac_addr[ETH_ALEN]; unsigned long last_update; struct hlist_node hash_entry; @@ -980,6 +982,18 @@ struct batadv_dat_entry { }; /** + * batadv_dat_types - types used in batadv_dat_entry for IP + * @BATADV_DAT_IPv4: IPv4 address type + * @BATADV_DAT_IPv6: IPv6 address type + */ +enum batadv_dat_types { + BATADV_DAT_IPV4, +#if IS_ENABLED(CONFIG_IPV6) + BATADV_DAT_IPV6, +#endif +}; + +/** * struct batadv_dat_candidate - candidate destination for DAT operations * @type: the type of the selected candidate. It can one of the following: * - BATADV_DAT_CANDIDATE_NOT_FOUND -- 1.7.10.4

2 4

[B.A.T.M.A.N.] [PATCH] batman-adv: switch to a new packet compatibility version
by Antonio Quartulli 20 Apr '13

20 Apr '13

With this change batman-adv is breaking compatibility with older versions and it is moving to compat-version 15. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packet.h b/packet.h index a51ccfc..11a22c8 100644 --- a/packet.h +++ b/packet.h @@ -48,7 +48,7 @@ enum batadv_subtype { }; /* this file is included by batctl which needs these defines */ -#define BATADV_COMPAT_VERSION 14 +#define BATADV_COMPAT_VERSION 15 enum batadv_iv_flags { BATADV_NOT_BEST_NEXT_HOP = BIT(3), -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: use the proper header len when checking the TTVN
by Antonio Quartulli 20 Apr '13

20 Apr '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Unicast packet might be of type either UNICAST or UNICAST4ADDR. In the two cases the header size is different, but the mechanism checking the TTVN field was assuming it to be always of the same type (UNICAST), so failing to access the inner Ethernet header in case of UNICAST4ADDR. Fix this by passing the real header length as argument. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- routing.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/routing.c b/routing.c index 5ee21ce..572e4f9 100644 --- a/routing.c +++ b/routing.c @@ -922,7 +922,7 @@ out: } static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, - struct sk_buff *skb) { + struct sk_buff *skb, int hdr_len) { uint8_t curr_ttvn, old_ttvn; struct batadv_orig_node *orig_node; struct ethhdr *ethhdr; @@ -931,7 +931,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, int is_old_ttvn; /* check if there is enough data before accessing it */ - if (pskb_may_pull(skb, sizeof(*unicast_packet) + ETH_HLEN) < 0) + if (pskb_may_pull(skb, hdr_len + ETH_HLEN) < 0) return 0; /* create a copy of the skb (in case of for re-routing) to modify it. */ @@ -939,7 +939,7 @@ static int batadv_check_unicast_ttvn(struct batadv_priv *bat_priv, return 0; unicast_packet = (struct batadv_unicast_packet *)skb->data; - ethhdr = (struct ethhdr *)(skb->data + sizeof(*unicast_packet)); + ethhdr = (struct ethhdr *)(skb->data + hdr_len); /* check if the destination client was served by this node and it is now * roaming. In this case, it means that the node has got a ROAM_ADV @@ -1046,8 +1046,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, if (batadv_check_unicast_packet(skb, hdr_size) < 0) return NET_RX_DROP; - - if (!batadv_check_unicast_ttvn(bat_priv, skb)) + if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size)) return NET_RX_DROP; /* packet for me */ @@ -1091,7 +1090,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb, if (batadv_check_unicast_packet(skb, hdr_size) < 0) return NET_RX_DROP; - if (!batadv_check_unicast_ttvn(bat_priv, skb)) + if (!batadv_check_unicast_ttvn(bat_priv, skb, hdr_size)) return NET_RX_DROP; unicast_packet = (struct batadv_unicast_frag_packet *)skb->data; -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c
by Martin Hundebøll 20 Apr '13

20 Apr '13

The call to batadv_nc_skb_forward() fits better in batadv_send_skb_to_orig(), as this is where the actual next hop is looked up. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- This is a patch to prepare for the merge of the next fragmentation patches, as these will remove the current lookup of the next-hop in route_unicast_packet(). network-coding.c | 5 ++--- network-coding.h | 6 ++---- routing.c | 9 +++------ send.c | 17 +++++++++++------ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/network-coding.c b/network-coding.c index c93df9e..dc94b76 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1359,18 +1359,17 @@ static bool batadv_nc_skb_add_to_path(struct sk_buff *skb, * buffer * @skb: data skb to forward * @neigh_node: next hop to forward packet to - * @ethhdr: pointer to the ethernet header inside the skb * * Returns true if the skb was consumed (encoded packet sent) or false otherwise */ bool batadv_nc_skb_forward(struct sk_buff *skb, - struct batadv_neigh_node *neigh_node, - struct ethhdr *ethhdr) + struct batadv_neigh_node *neigh_node) { const struct net_device *netdev = neigh_node->if_incoming->soft_iface; struct batadv_priv *bat_priv = netdev_priv(netdev); struct batadv_unicast_packet *packet; struct batadv_nc_path *nc_path; + struct ethhdr *ethhdr = eth_hdr(skb); __be32 packet_id; u8 *payload; diff --git a/network-coding.h b/network-coding.h index 4fa6d0c..85a4ec8 100644 --- a/network-coding.h +++ b/network-coding.h @@ -36,8 +36,7 @@ void batadv_nc_purge_orig(struct batadv_priv *bat_priv, void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv); void batadv_nc_init_orig(struct batadv_orig_node *orig_node); bool batadv_nc_skb_forward(struct sk_buff *skb, - struct batadv_neigh_node *neigh_node, - struct ethhdr *ethhdr); + struct batadv_neigh_node *neigh_node); void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv, struct sk_buff *skb); void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv, @@ -87,8 +86,7 @@ static inline void batadv_nc_init_orig(struct batadv_orig_node *orig_node) } static inline bool batadv_nc_skb_forward(struct sk_buff *skb, - struct batadv_neigh_node *neigh_node, - struct ethhdr *ethhdr) + struct batadv_neigh_node *neigh_node) { return false; } diff --git a/routing.c b/routing.c index 0e10720..19cf8b6 100644 --- a/routing.c +++ b/routing.c @@ -835,16 +835,13 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, /* decrement ttl */ unicast_packet->header.ttl--; - /* network code packet if possible */ - if (batadv_nc_skb_forward(skb, neigh_node, ethhdr)) { - ret = NET_RX_SUCCESS; - } else if (batadv_send_skb_to_orig(skb, orig_node, recv_if)) { - ret = NET_RX_SUCCESS; - + if (batadv_send_skb_to_orig(skb, orig_node, recv_if)) { /* Update stats counter */ batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, skb->len + ETH_HLEN); + + ret = NET_RX_SUCCESS; } out: diff --git a/send.c b/send.c index ed7072a..a241a79 100644 --- a/send.c +++ b/send.c @@ -110,8 +110,13 @@ bool batadv_send_skb_to_orig(struct sk_buff *skb, if (!neigh_node) return false; - /* route it */ - batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr); + /* try to network code the packet, if it is received on an interface + * (i.e. being forwarded). If the packet originates from this node or if + * network coding fails, then send the packet as usual. + */ + if (!recv_if || !batadv_nc_skb_forward(skb, neigh_node)) + batadv_send_skb_packet(skb, neigh_node->if_incoming, + neigh_node->addr); batadv_neigh_node_free_ref(neigh_node); @@ -122,8 +127,8 @@ 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)) + 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 @@ -132,8 +137,8 @@ void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface) * 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; + 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); } -- 1.8.2.1

2 6

[B.A.T.M.A.N.] [PATCHv3 0/6] compat bum work
by Simon Wunderlich 20 Apr '13

20 Apr '13

Changes to v2: * add some kernel doc * fix typos in commit messages Simon Wunderlich (6): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags batman-adv: only add recordroute information to icmp request/reply Makefile.kbuild | 1 - bat_iv_ogm.c | 7 - debugfs.c | 9 - hard-interface.c | 9 - main.c | 39 ++- packet.h | 75 +++-- routing.c | 83 ++--- routing.h | 2 + send.c | 1 - soft-interface.c | 1 - sysfs.c | 72 ----- types.h | 82 ----- vis.c | 935 ------------------------------------------------------ vis.h | 36 --- 14 files changed, 99 insertions(+), 1253 deletions(-) delete mode 100644 vis.c delete mode 100644 vis.h -- 1.7.10.4

1 6

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N April 2013