B.A.T.M.A.N May 2013

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

16 participants
80 discussions

[B.A.T.M.A.N.] pull request: batman-adv 2013-05-29
by Antonio Quartulli 29 May '13

29 May '13

Hello David, this is our pull request intended for net-next/linux-3.11. The only real behavioural change in this batch is the broadcast overhead reduction on non-wireless interfaces brought by Matthias Schiffer. The rest is made up by code cleanups and refactoring. Two highlights on the refactoring are the introduction of netdev_alloc_skb_ip_align() to avoid to deal with NET_IP_ALIGN manually and the introduction of the eth_hdr() wherever it was possible in order to improve readability. Please pull or let me know of any problem. Thanks a lot, Antonio The following changes since commit 06ecf24bdf2b7afc6c8fd13de6dba2a96dd331b6: net: Fix build warnings after mac_header and transport_header became __u16. (2013-05-28 13:15:50 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 6715fd3f0538e805b6a769d66823ec16b8b647ac: batman-adv: Start new development cycle (2013-05-29 02:44:56 +0200) ---------------------------------------------------------------- Included changes: - reduce broadcast overhead on non-lossy wired links - fix typos in kernel doc - use eth_hdr() when possible - use netdev_allock_skb_ip_align() and don't deal with NET_IP_ALIGN - change VID semantic in the BLA component - other minor cleanups and code refactoring ---------------------------------------------------------------- Antonio Quartulli (14): batman-adv: drop useless argument seqno in neighbor creation batman-adv: slightly improve neighbor creation debug message batman-adv: don't check the source address twice batman-adv: don't check compat version twice batman-adv: do not silently ignore wrong condition batman-adv: don't initialise batman_iv private members in hard-interface.c batman-adv: use eth_hdr() when it makes sense batman-adv: move ring_buffer helper functions in bat_iv_ogm batman-adv: move batadv_slide_own_bcast_window to bat_iv_ogm.c batman-adv: refactor batadv_tt_local_event() batman-adv: don't deal with NET_IP_ALIGN manually batman-adv: pass a 16bit long flag argument to tt_global_add() batman-adv: change VID semantic in the BLA code batman-adv: print the VID properly Linus Lüssing (1): batman-adv: Remove unnecessary INIT_HLIST_NODE() calls Marek Lindner (2): batman-adv: fix typos in kernel doc & comments batman-adv: do not print orig nodes without nc neighbors on nc table print Martin Hundebøll (1): batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c Matthias Schiffer (2): batman-adv: split batadv_is_wifi_iface() into two functions batman-adv: send each broadcast only once on non-wireless interfaces Simon Wunderlich (1): batman-adv: Start new development cycle net/batman-adv/Makefile | 1 - net/batman-adv/bat_iv_ogm.c | 122 ++++++++++++++++++++++++--------- net/batman-adv/bridge_loop_avoidance.c | 94 +++++++++++++------------ net/batman-adv/bridge_loop_avoidance.h | 12 ++-- net/batman-adv/distributed-arp-table.c | 82 +++++++++++----------- net/batman-adv/hard-interface.c | 96 +++++++++++++++----------- net/batman-adv/icmp_socket.c | 4 +- net/batman-adv/main.h | 18 ++++- net/batman-adv/network-coding.c | 22 +++--- net/batman-adv/network-coding.h | 6 +- net/batman-adv/originator.c | 6 +- net/batman-adv/originator.h | 2 +- net/batman-adv/ring_buffer.c | 51 -------------- net/batman-adv/ring_buffer.h | 27 -------- net/batman-adv/routing.c | 64 +++++------------ net/batman-adv/routing.h | 1 - net/batman-adv/send.c | 36 ++++++---- net/batman-adv/send.h | 6 +- net/batman-adv/soft-interface.c | 6 +- net/batman-adv/translation-table.c | 74 +++++++++++++------- net/batman-adv/translation-table.h | 2 +- net/batman-adv/types.h | 6 +- net/batman-adv/unicast.c | 2 +- net/batman-adv/vis.c | 19 ++--- 24 files changed, 395 insertions(+), 364 deletions(-) delete mode 100644 net/batman-adv/ring_buffer.c delete mode 100644 net/batman-adv/ring_buffer.h

2 15

[B.A.T.M.A.N.] Basic Multicast Optimizations
by Linus Lüssing 28 May '13

28 May '13

This is the second revision of the basic multicast optimization patches. It includes one functional fix and many style fixes, thanks to Antonios feedback. Three things were not included from these suggestions: * The default mcast TVLV flags were left as it is not as easy to switch. (see answer/explanation to [PATCH 2/3]) * for_each_pmc_rcu() was not moved to a commen net header file, only a TODO was added. Will do that after this code might have landed in net. Additionally the limitation of 255 multicast listeners per originator was removed (it was more a relic of the pre-TT announcement mechanism and such limitations should be taken care of by the current TT infrastructure instead). Cheers, Linus

4 11

[B.A.T.M.A.N.] [PATCH] batman-adv: consider network coding overhead when calculating required mtu
by Marek Lindner 28 May '13

28 May '13

The module prints a warning when the MTU on the hard interface is too small to transfer payload traffic without fragmentation. The required MTU is calculated based on the encapsulation header size. If network coding is compild into the module its header size is taken into account as well. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- hard-interface.c | 19 ++++++++++--------- main.c | 25 +++++++++++++++++++++++++ main.h | 1 + soft-interface.c | 2 +- types.h | 7 ------- 5 files changed, 37 insertions(+), 17 deletions(-) diff --git a/hard-interface.c b/hard-interface.c index c343aa8..ca50dd4 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -269,9 +269,10 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) const struct batadv_priv *bat_priv = netdev_priv(soft_iface); const struct batadv_hard_iface *hard_iface; /* allow big frames if all devices are capable to do so - * (have MTU > 1500 + BAT_HEADER_LEN) + * (have MTU > 1500 + batadv_max_header_len()) */ int min_mtu = ETH_DATA_LEN; + int max_header_len = batadv_max_header_len(); if (atomic_read(&bat_priv->fragmentation)) goto out; @@ -285,8 +286,7 @@ int batadv_hardif_min_mtu(struct net_device *soft_iface) if (hard_iface->soft_iface != soft_iface) continue; - min_mtu = min_t(int, - hard_iface->net_dev->mtu - BATADV_HEADER_LEN, + min_mtu = min_t(int, hard_iface->net_dev->mtu - max_header_len, min_mtu); } rcu_read_unlock(); @@ -380,6 +380,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, struct batadv_priv *bat_priv; struct net_device *soft_iface, *master; __be16 ethertype = __constant_htons(ETH_P_BATMAN); + int max_header_len = batadv_max_header_len(); int ret; if (hard_iface->if_status != BATADV_IF_NOT_IN_USE) @@ -448,18 +449,18 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->net_dev->name); if (atomic_read(&bat_priv->fragmentation) && - hard_iface->net_dev->mtu < ETH_DATA_LEN + BATADV_HEADER_LEN) + hard_iface->net_dev->mtu < ETH_DATA_LEN + max_header_len) batadv_info(hard_iface->soft_iface, - "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %zi would solve the problem.\n", + "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. Packets going over this interface will be fragmented on layer2 which could impact the performance. Setting the MTU to %i would solve the problem.\n", hard_iface->net_dev->name, hard_iface->net_dev->mtu, - ETH_DATA_LEN + BATADV_HEADER_LEN); + ETH_DATA_LEN + max_header_len); if (!atomic_read(&bat_priv->fragmentation) && - hard_iface->net_dev->mtu < ETH_DATA_LEN + BATADV_HEADER_LEN) + hard_iface->net_dev->mtu < ETH_DATA_LEN + max_header_len) batadv_info(hard_iface->soft_iface, - "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %zi.\n", + "The MTU of interface %s is too small (%i) to handle the transport of batman-adv packets. If you experience problems getting traffic through try increasing the MTU to %i.\n", hard_iface->net_dev->name, hard_iface->net_dev->mtu, - ETH_DATA_LEN + BATADV_HEADER_LEN); + ETH_DATA_LEN + max_header_len); if (batadv_hardif_is_iface_up(hard_iface)) batadv_hardif_activate_interface(hard_iface); diff --git a/main.c b/main.c index 7188beb..25520b1 100644 --- a/main.c +++ b/main.c @@ -252,6 +252,31 @@ out: return primary_if; } +/** + * batadv_max_header_len - calculate maximum encapsulation overhead for a + * payload packet + * + * Return the maximum encapsulation overhead in bytes. + */ +int batadv_max_header_len(void) +{ + int header_len = 0; + + header_len = max_t(int, header_len, + sizeof(struct batadv_unicast_packet)); + header_len = max_t(int, header_len, + sizeof(struct batadv_unicast_4addr_packet)); + header_len = max_t(int, header_len, + sizeof(struct batadv_bcast_packet)); + +#ifdef CONFIG_BATMAN_ADV_NC + header_len = max_t(int, header_len, + sizeof(struct batadv_coded_packet)); +#endif + + return header_len; +} + static int batadv_recv_unhandled_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if) { diff --git a/main.h b/main.h index 3db6c2e..1f0b135 100644 --- a/main.h +++ b/main.h @@ -193,6 +193,7 @@ void batadv_mesh_free(struct net_device *soft_iface); int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_hard_iface * batadv_seq_print_text_primary_if_get(struct seq_file *seq); +int batadv_max_header_len(void); int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct net_device *orig_dev); diff --git a/soft-interface.c b/soft-interface.c index e157463..991a91f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -615,7 +615,7 @@ static void batadv_softif_init_early(struct net_device *dev) */ dev->mtu = ETH_DATA_LEN; /* reserve more space in the skbuff for our header */ - dev->hard_header_len = BATADV_HEADER_LEN; + dev->hard_header_len = batadv_max_header_len(); /* generate random address */ eth_hw_addr_random(dev); diff --git a/types.h b/types.h index c388e47..18ea0d7 100644 --- a/types.h +++ b/types.h @@ -24,13 +24,6 @@ #include "bitarray.h" #include <linux/kernel.h> -/** - * Maximum overhead for the encapsulation for a payload packet - */ -#define BATADV_HEADER_LEN \ - (ETH_HLEN + max(sizeof(struct batadv_unicast_packet), \ - sizeof(struct batadv_bcast_packet))) - #ifdef CONFIG_BATMAN_ADV_DAT /* batadv_dat_addr_t is the type used for all DHT addresses. If it is changed, -- 1.7.10.4

1 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix num_changes type to uint16_t
by Antonio Quartulli 28 May '13

28 May '13

Since the introduction of the tvlv_tt_data struct variables storing the number of TT changes are always declared as uint16_t, however some of them were not changed. Switch them al to uint16_t. Introduced by 8405301b979466610a726b7d595b6bfee5306cf7 ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- translation-table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translation-table.c b/translation-table.c index 44e7789..f6b96cb 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1486,7 +1486,7 @@ static void batadv_tt_req_list_free(struct batadv_priv *bat_priv) static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *tt_buff, - uint8_t tt_num_changes) + uint16_t tt_num_changes) { uint16_t tt_buff_len = batadv_tt_len(tt_num_changes); @@ -2407,8 +2407,8 @@ out: static void batadv_tt_update_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *tt_buff, - uint8_t tt_num_changes, - uint8_t ttvn, uint32_t tt_crc) + uint16_t tt_num_changes, uint8_t ttvn, + uint32_t tt_crc) { uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); bool full_table = true; -- 1.8.1.5

2 3

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: properly align tvlv infrastructure
by Marek Lindner 28 May '13

28 May '13

4bytes long members must start at an address multiple of 4 in order to avoid unaligned memory access. Therefore, the tvlv short type is eliminated in favor of tvlv long and that distinction removed from the code. Introduced by 0b6aa0d43767889eeda43a132cf5e73df4e63bf2 "batman-adv: tvlv - basic infrastructure" Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- main.c | 91 +++++++++++++++++--------------------------------------------- packet.h | 44 +++++++----------------------- types.h | 1 - 3 files changed, 33 insertions(+), 103 deletions(-) diff --git a/main.c b/main.c index 7188beb..0194172 100644 --- a/main.c +++ b/main.c @@ -604,12 +604,8 @@ static uint16_t batadv_tvlv_container_list_size(struct batadv_priv *bat_priv) uint16_t tvlv_len = 0; hlist_for_each_entry(tvlv, &bat_priv->tvlv.container_list, list) { - if (tvlv->tvlv_hdr.long_tvlv) - tvlv_len += sizeof(struct batadv_tvlv_long); - else - tvlv_len += sizeof(struct batadv_tvlv_short); - - tvlv_len += tvlv->value_len; + tvlv_len += sizeof(struct batadv_tvlv_hdr); + tvlv_len += tvlv->tvlv_hdr.len; } return tvlv_len; @@ -678,13 +674,11 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv, if (!tvlv_new) return; - tvlv_new->value_len = tvlv_value_len; tvlv_new->tvlv_hdr.version = version; tvlv_new->tvlv_hdr.type = type; - if (tvlv_new->value_len > 255) - tvlv_new->tvlv_hdr.long_tvlv = 1; + tvlv_new->tvlv_hdr.len = tvlv_value_len; - memcpy(tvlv_new + 1, tvlv_value, tvlv_new->value_len); + memcpy(tvlv_new + 1, tvlv_value, tvlv_new->tvlv_hdr.len); INIT_HLIST_NODE(&tvlv_new->list); atomic_set(&tvlv_new->refcount, 1); @@ -748,8 +742,7 @@ uint16_t batadv_tvlv_container_ogm_append(struct batadv_priv *bat_priv, int packet_min_len) { struct batadv_tvlv_container *tvlv; - struct batadv_tvlv_short *tvlv_short; - struct batadv_tvlv_long *tvlv_long; + struct batadv_tvlv_hdr *tvlv_hdr; uint16_t tvlv_value_len; void *tvlv_value; bool ret; @@ -769,20 +762,13 @@ uint16_t batadv_tvlv_container_ogm_append(struct batadv_priv *bat_priv, tvlv_value = (*packet_buff) + packet_min_len; hlist_for_each_entry(tvlv, &bat_priv->tvlv.container_list, list) { - if (tvlv->tvlv_hdr.long_tvlv) { - tvlv_long = tvlv_value; - tvlv_long->tvlv_hdr = tvlv->tvlv_hdr; - tvlv_long->len = htons(tvlv->value_len); - tvlv_value = tvlv_long + 1; - } else { - tvlv_short = tvlv_value; - tvlv_short->tvlv_hdr = tvlv->tvlv_hdr; - tvlv_short->len = tvlv->value_len; - tvlv_value = tvlv_short + 1; - } - - memcpy(tvlv_value, tvlv + 1, tvlv->value_len); - tvlv_value = (uint8_t *)tvlv_value + tvlv->value_len; + tvlv_hdr = tvlv_value; + tvlv_hdr->type = tvlv->tvlv_hdr.type; + tvlv_hdr->version = tvlv->tvlv_hdr.version; + tvlv_hdr->len = htons(tvlv->tvlv_hdr.len); + tvlv_value = tvlv_hdr + 1; + memcpy(tvlv_value, tvlv + 1, tvlv->tvlv_hdr.len); + tvlv_value = (uint8_t *)tvlv_value + tvlv->tvlv_hdr.len; } end: @@ -865,30 +851,16 @@ int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, void *tvlv_value, uint16_t tvlv_value_len) { struct batadv_tvlv_handler *tvlv_handler; - struct batadv_tvlv_short *tvlv_short; - struct batadv_tvlv_long *tvlv_long; struct batadv_tvlv_hdr *tvlv_hdr; uint16_t tvlv_value_cont_len; uint8_t cifnotfound = BATADV_TVLV_HANDLER_OGM_CIFNOTFND; int ret = NET_RX_SUCCESS; - while (tvlv_value_len >= sizeof(*tvlv_short)) { + while (tvlv_value_len >= sizeof(*tvlv_hdr)) { tvlv_hdr = tvlv_value; - - if (tvlv_hdr->long_tvlv) { - if (sizeof(*tvlv_long) > tvlv_value_len) - break; - - tvlv_long = tvlv_value; - tvlv_value_cont_len = ntohs(tvlv_long->len); - tvlv_value = tvlv_long + 1; - tvlv_value_len -= sizeof(*tvlv_long); - } else { - tvlv_short = tvlv_value; - tvlv_value_cont_len = tvlv_short->len; - tvlv_value = tvlv_short + 1; - tvlv_value_len -= sizeof(*tvlv_short); - } + tvlv_value_cont_len = ntohs(tvlv_hdr->len); + tvlv_value = tvlv_hdr + 1; + tvlv_value_len -= sizeof(*tvlv_hdr); if (tvlv_value_cont_len > tvlv_value_len) break; @@ -1042,8 +1014,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, void *tvlv_value, uint16_t tvlv_value_len) { struct batadv_unicast_tvlv_packet *unicast_tvlv_packet; - struct batadv_tvlv_short *tvlv_short; - struct batadv_tvlv_long *tvlv_long; + struct batadv_tvlv_hdr *tvlv_hdr; struct batadv_orig_node *orig_node; struct sk_buff *skb = NULL; unsigned char *tvlv_buff; @@ -1058,11 +1029,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, if (tvlv_value_len > 255) tvlv_long_hdr = 1; - tvlv_len = tvlv_value_len; - if (tvlv_long_hdr) - tvlv_len += sizeof(*tvlv_long); - else - tvlv_len += sizeof(*tvlv_short); + tvlv_len = sizeof(*tvlv_hdr) + tvlv_value_len; skb = netdev_alloc_skb_ip_align(NULL, ETH_HLEN + hdr_len + tvlv_len); if (!skb) @@ -1076,26 +1043,16 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, unicast_tvlv_packet->header.ttl = BATADV_TTL; unicast_tvlv_packet->reserved = 0; unicast_tvlv_packet->tvlv_len = htons(tvlv_len); + unicast_tvlv_packet->align = 0; memcpy(unicast_tvlv_packet->src, src, ETH_ALEN); memcpy(unicast_tvlv_packet->dst, dst, ETH_ALEN); tvlv_buff = (unsigned char *)(unicast_tvlv_packet + 1); - - if (tvlv_long_hdr) { - tvlv_long = (struct batadv_tvlv_long *)tvlv_buff; - tvlv_long->tvlv_hdr.version = version; - tvlv_long->tvlv_hdr.type = type; - tvlv_long->tvlv_hdr.long_tvlv = 1; - tvlv_long->len = htons(tvlv_value_len); - tvlv_buff += sizeof(*tvlv_long); - } else { - tvlv_short = (struct batadv_tvlv_short *)tvlv_buff; - tvlv_short->tvlv_hdr.version = version; - tvlv_short->tvlv_hdr.type = type; - tvlv_short->len = tvlv_value_len; - tvlv_buff += sizeof(*tvlv_short); - } - + tvlv_hdr = (struct batadv_tvlv_hdr *)tvlv_buff; + tvlv_hdr->version = version; + tvlv_hdr->type = type; + tvlv_hdr->len = htons(tvlv_value_len); + tvlv_buff += sizeof(*tvlv_hdr); memcpy(tvlv_buff, tvlv_value, tvlv_value_len); if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) diff --git a/packet.h b/packet.h index 2a73ebd..840d73d 100644 --- a/packet.h +++ b/packet.h @@ -327,53 +327,27 @@ struct batadv_coded_packet { * @src: address of the source * @dst: address of the destination * @tvlv_len: length of tvlv data following the unicast tvlv header + * @align: 2 bytes to align the header to a 4 byte boundry */ struct batadv_unicast_tvlv_packet { struct batadv_header header; - uint8_t reserved; - uint8_t dst[ETH_ALEN]; - uint8_t src[ETH_ALEN]; - __be16 tvlv_len; + uint8_t reserved; + uint8_t dst[ETH_ALEN]; + uint8_t src[ETH_ALEN]; + __be16 tvlv_len; + uint16_t align; }; /** * struct batadv_tvlv_hdr - base tvlv header struct - * @long_tvlv: flag indicating whether this is a short tvlv container (max 256 - * bytes) or a long tvlv one (up to ETH_DATA_LEN) * @type: tvlv container type (see batadv_tvlv_type) * @version: tvlv container version + * @len: tvlv container length */ struct batadv_tvlv_hdr { -#if defined(__BIG_ENDIAN_BITFIELD) - uint8_t long_tvlv:1; - uint8_t type:7; -#elif defined(__LITTLE_ENDIAN_BITFIELD) - uint8_t type:7; - uint8_t long_tvlv:1; -#else -#error "unknown bitfield endianess" -#endif + uint8_t type; uint8_t version; -}; - -/** - * struct batadv_tvlv_short - short tvlv header struct - * @tvlv_hdr: base tvlv header - * @len: tvlv container length (limited to 255 bytes) - */ -struct batadv_tvlv_short { - struct batadv_tvlv_hdr tvlv_hdr; - uint8_t len; -}; - -/** - * struct batadv_tvlv_long - long tvlv header struct - * @tvlv_hdr: base tvlv header - * @len: tvlv container length - */ -struct batadv_tvlv_long { - struct batadv_tvlv_hdr tvlv_hdr; - __be16 len; + __be16 len; }; /** diff --git a/types.h b/types.h index c388e47..f99b508 100644 --- a/types.h +++ b/types.h @@ -976,7 +976,6 @@ struct batadv_dat_candidate { struct batadv_tvlv_container { struct hlist_node list; struct batadv_tvlv_hdr tvlv_hdr; - uint16_t value_len; atomic_t refcount; }; -- 1.7.10.4

1 3

[B.A.T.M.A.N.] [PATCH] batman-adv: correctly align the tt_tvlv_data struct
by Antonio Quartulli 28 May '13

28 May '13

4bytes long members must start at an address multiple of 4 in order to avoid unaligned memory access. Add 2 padding bytes to satisfy this requirement. Introduced by c5e7a06a29612056006e4dc01910c0b44e858583 "batman-adv: use CRC32C instead of CRC16 in TT code" Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- packet.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packet.h b/packet.h index 21254a4..8675b52 100644 --- a/packet.h +++ b/packet.h @@ -391,11 +391,13 @@ struct batadv_tvlv_gateway_data { * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container * @flags: translation table flags (see batadv_tt_data_flags) * @ttvn: translation table version number + * @reserved: not used, useful for alignment purposes * @crc: crc32 checksum of the local translation table */ struct batadv_tvlv_tt_data { uint8_t flags; uint8_t ttvn; + uint16_t reserved; __be32 crc; }; -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: fix typo in kernel doc
by Antonio Quartulli 28 May '13

28 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> Introduced by 8405301b979466610a726b7d595b6bfee5306cf7 ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packet.h b/packet.h index 2a73ebd..21254a4 100644 --- a/packet.h +++ b/packet.h @@ -388,7 +388,7 @@ struct batadv_tvlv_gateway_data { }; /** - * struct tvlv_tt_data - tt data propagated through the tt tvlv container + * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container * @flags: translation table flags (see batadv_tt_data_flags) * @ttvn: translation table version number * @crc: crc32 checksum of the local translation table -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: fix num_changes type to uint16_t
by Antonio Quartulli 28 May '13

28 May '13

Since the introduction of the tvlv_tt_data struct variables storing the number of TT changes are always declared as uint16_t, however some of them were not changed. Switch them al to uint16_t. Introduced by 8405301b979466610a726b7d595b6bfee5306cf7 ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- patches based on top of: ("batman-adv: correctly align the tt_tvlv_data struct") translation-table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translation-table.c b/translation-table.c index 44e7789..f6b96cb 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1486,7 +1486,7 @@ static void batadv_tt_req_list_free(struct batadv_priv *bat_priv) static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *tt_buff, - uint8_t tt_num_changes) + uint16_t tt_num_changes) { uint16_t tt_buff_len = batadv_tt_len(tt_num_changes); @@ -2407,8 +2407,8 @@ out: static void batadv_tt_update_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const unsigned char *tt_buff, - uint8_t tt_num_changes, - uint8_t ttvn, uint32_t tt_crc) + uint16_t tt_num_changes, uint8_t ttvn, + uint32_t tt_crc) { uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); bool full_table = true; -- 1.8.1.5

1 3

[B.A.T.M.A.N.] [PATCHv2] batman-adv: create common header for ICMP packets
by Antonio Quartulli 26 May '13

26 May '13

From: Antonio Quartulli <antonio(a)open-mesh.com> the icmp and the icmp_rr packets share the same initial fields since they use the same code to be processed and forwarded. Extract the common fields and put them into a separate struct so that future ICMP packets can be easily added without bloating the packet definition. However, keep the seqno field outside of the newly created common header because future ICMP types may require a bigger sequence number space. This change breaks compatibility due to fields reordering in the ICMP headers. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- v2: - merge of [PATCH 1/2] batman-adv: simplify ICMP packet structures and [PATCH 2/2] batman-adv: move seqno field outside of the common ICMP header - reword commit subject and message - rename the new member from "ih" to "icmph" icmp_socket.c | 22 +++++++++++----------- main.c | 4 ++-- packet.h | 38 ++++++++++++++++++++++++++++---------- routing.c | 40 +++++++++++++++++++++------------------- 4 files changed, 62 insertions(+), 42 deletions(-) diff --git a/icmp_socket.c b/icmp_socket.c index b27508b..512efcc 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -191,25 +191,25 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto free_skb; } - if (icmp_packet->header.packet_type != BATADV_ICMP) { + if (icmp_packet->icmph.header.packet_type != BATADV_ICMP) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); len = -EINVAL; goto free_skb; } - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); len = -EINVAL; goto free_skb; } - icmp_packet->uid = socket_client->index; + icmp_packet->icmph.uid = socket_client->index; - if (icmp_packet->header.version != BATADV_COMPAT_VERSION) { - icmp_packet->msg_type = BATADV_PARAMETER_PROBLEM; - icmp_packet->header.version = BATADV_COMPAT_VERSION; + if (icmp_packet->icmph.header.version != BATADV_COMPAT_VERSION) { + icmp_packet->icmph.msg_type = BATADV_PARAMETER_PROBLEM; + icmp_packet->icmph.header.version = BATADV_COMPAT_VERSION; batadv_socket_add_packet(socket_client, icmp_packet, packet_len); goto free_skb; @@ -218,7 +218,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dst_unreach; - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.dst); if (!orig_node) goto dst_unreach; @@ -232,7 +232,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, if (neigh_node->if_incoming->if_status != BATADV_IF_ACTIVE) goto dst_unreach; - memcpy(icmp_packet->orig, + memcpy(icmp_packet->icmph.orig, primary_if->net_dev->dev_addr, ETH_ALEN); if (packet_len == sizeof(struct batadv_icmp_packet_rr)) @@ -243,7 +243,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto out; dst_unreach: - icmp_packet->msg_type = BATADV_DESTINATION_UNREACHABLE; + icmp_packet->icmph.msg_type = BATADV_DESTINATION_UNREACHABLE; batadv_socket_add_packet(socket_client, icmp_packet, packet_len); free_skb: kfree_skb(skb); @@ -317,7 +317,7 @@ static void batadv_socket_add_packet(struct batadv_socket_client *socket_client, /* while waiting for the lock the socket_client could have been * deleted */ - if (!batadv_socket_client_hash[icmp_packet->uid]) { + if (!batadv_socket_client_hash[icmp_packet->icmph.uid]) { spin_unlock_bh(&socket_client->lock); kfree(socket_packet); return; @@ -346,7 +346,7 @@ void batadv_socket_receive_packet(struct batadv_icmp_packet_rr *icmp_packet, { struct batadv_socket_client *hash; - hash = batadv_socket_client_hash[icmp_packet->uid]; + hash = batadv_socket_client_hash[icmp_packet->icmph.uid]; if (hash) batadv_socket_add_packet(hash, icmp_packet, icmp_len); } diff --git a/main.c b/main.c index af89c09..8d4fac5 100644 --- a/main.c +++ b/main.c @@ -344,8 +344,8 @@ static void batadv_recv_handler_init(void) BUILD_BUG_ON(offsetof(struct batadv_unicast_packet, dest) != 4); BUILD_BUG_ON(offsetof(struct batadv_unicast_frag_packet, dest) != 4); BUILD_BUG_ON(offsetof(struct batadv_unicast_tvlv_packet, dst) != 4); - BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, dst) != 4); - BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, dst) != 4); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet, icmph.dst) != 4); + BUILD_BUG_ON(offsetof(struct batadv_icmp_packet_rr, icmph.dst) != 4); /* broadcast packet */ batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet; diff --git a/packet.h b/packet.h index 7d45890..ac1e0b0 100644 --- a/packet.h +++ b/packet.h @@ -192,29 +192,47 @@ struct batadv_ogm_packet { #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) -struct batadv_icmp_packet { +/** + * batadc_icmp_header - common ICMP header + * @header: common batman header + * @msg_type: ICMP packet type + * @dst: address of the destination node + * @orig: address of the source node + * @uid: local ICMP socket identifier + */ +struct batadv_icmp_header { struct batadv_header header; uint8_t msg_type; /* see ICMP message types above */ uint8_t dst[ETH_ALEN]; uint8_t orig[ETH_ALEN]; - __be16 seqno; uint8_t uid; +}; + +/** + * batadv_icmp_packet - ICMP packet + * @icmph: common ICMP header + * @reserved: not used - useful for alignment + * @seqno: ICMP sequence number + */ +struct batadv_icmp_packet { + struct batadv_icmp_header icmph; uint8_t reserved; + __be16 seqno; }; #define BATADV_RR_LEN 16 -/* icmp_packet_rr must start with all fields from imcp_packet - * as this is assumed by code that handles ICMP packets +/** + * batadv_icmp_packet_rr - ICMP RouteRecord packet + * @icmph: common ICMP header + * @rr_cur: number of entries the rr array + * @seqno: ICMP sequence number + * @rr: route record array */ struct batadv_icmp_packet_rr { - struct batadv_header header; - uint8_t msg_type; /* see ICMP message types above */ - uint8_t dst[ETH_ALEN]; - uint8_t orig[ETH_ALEN]; - __be16 seqno; - uint8_t uid; + struct batadv_icmp_header icmph; uint8_t rr_cur; + __be16 seqno; uint8_t rr[BATADV_RR_LEN][ETH_ALEN]; }; diff --git a/routing.c b/routing.c index 7c372f1..7d87142 100644 --- a/routing.c +++ b/routing.c @@ -258,7 +258,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* add data to device queue */ - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { batadv_socket_receive_packet(icmp_packet, icmp_len); goto out; } @@ -269,7 +269,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, /* answer echo request (ping) */ /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.orig); if (!orig_node) goto out; @@ -279,10 +279,11 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; - memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); - memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); - icmp_packet->msg_type = BATADV_ECHO_REPLY; - icmp_packet->header.ttl = BATADV_TTL; + memcpy(icmp_packet->icmph.dst, icmp_packet->icmph.orig, ETH_ALEN); + memcpy(icmp_packet->icmph.orig, primary_if->net_dev->dev_addr, + ETH_ALEN); + icmp_packet->icmph.msg_type = BATADV_ECHO_REPLY; + icmp_packet->icmph.header.ttl = BATADV_TTL; if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) ret = NET_RX_SUCCESS; @@ -306,9 +307,9 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet *)skb->data; /* send TTL exceeded if packet is an echo request (traceroute) */ - if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) { + if (icmp_packet->icmph.msg_type != BATADV_ECHO_REQUEST) { pr_debug("Warning - can't forward icmp packet from %pM to %pM: ttl exceeded\n", - icmp_packet->orig, icmp_packet->dst); + icmp_packet->icmph.orig, icmp_packet->icmph.dst); goto out; } @@ -317,7 +318,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, goto out; /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->orig); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.orig); if (!orig_node) goto out; @@ -327,10 +328,11 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, icmp_packet = (struct batadv_icmp_packet *)skb->data; - memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN); - memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN); - icmp_packet->msg_type = BATADV_TTL_EXCEEDED; - icmp_packet->header.ttl = BATADV_TTL; + memcpy(icmp_packet->icmph.dst, icmp_packet->icmph.orig, ETH_ALEN); + memcpy(icmp_packet->icmph.orig, primary_if->net_dev->dev_addr, + ETH_ALEN); + icmp_packet->icmph.msg_type = BATADV_TTL_EXCEEDED; + icmp_packet->icmph.header.ttl = BATADV_TTL; if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP) ret = NET_RX_SUCCESS; @@ -379,8 +381,8 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* add record route information if not full */ - if ((icmp_packet->msg_type == BATADV_ECHO_REPLY || - icmp_packet->msg_type == BATADV_ECHO_REQUEST) && + if ((icmp_packet->icmph.msg_type == BATADV_ECHO_REPLY || + icmp_packet->icmph.msg_type == BATADV_ECHO_REQUEST) && (hdr_size == sizeof(struct batadv_icmp_packet_rr)) && (icmp_packet->rr_cur < BATADV_RR_LEN)) { memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]), @@ -389,15 +391,15 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, } /* packet for me */ - if (batadv_is_my_mac(bat_priv, icmp_packet->dst)) + if (batadv_is_my_mac(bat_priv, icmp_packet->icmph.dst)) return batadv_recv_my_icmp_packet(bat_priv, skb, hdr_size); /* TTL exceeded */ - if (icmp_packet->header.ttl < 2) + if (icmp_packet->icmph.header.ttl < 2) return batadv_recv_icmp_ttl_exceeded(bat_priv, skb); /* get routing information */ - orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->dst); + orig_node = batadv_orig_hash_find(bat_priv, icmp_packet->icmph.dst); if (!orig_node) goto out; @@ -408,7 +410,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, icmp_packet = (struct batadv_icmp_packet_rr *)skb->data; /* decrement ttl */ - icmp_packet->header.ttl--; + icmp_packet->icmph.header.ttl--; /* route it */ if (batadv_send_skb_to_orig(skb, orig_node, recv_if) != NET_XMIT_DROP) -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: Add dummy soft-interface rx mode handler
by Linus Lüssing 25 May '13

25 May '13

We do not actually need to set any rx filters for the virtual batman soft interface. However a dummy handler enables a user to set static multicast listeners for instance. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- * Fixes issue #171 soft-interface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 2bad57f..e40e74f 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -137,6 +137,10 @@ static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu) return 0; } +static void batadv_interface_set_rx_mode(struct net_device *dev) +{ +} + static int batadv_interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { @@ -572,6 +576,7 @@ static const struct net_device_ops batadv_netdev_ops = { .ndo_get_stats = batadv_interface_stats, .ndo_set_mac_address = batadv_interface_set_mac_addr, .ndo_change_mtu = batadv_interface_change_mtu, + .ndo_set_rx_mode = batadv_interface_set_rx_mode, .ndo_start_xmit = batadv_interface_tx, .ndo_validate_addr = eth_validate_addr, .ndo_add_slave = batadv_softif_slave_add, -- 1.7.10.4

3 2

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N May 2013