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.] [PATCH] batman-adv: fix possible memleak in fragmentation
by Martin Hundebøll 04 Jun '13

04 Jun '13

Use a variable for return value in batadv_frag_insert_packet() to free the allocated struct batadv_frag_list_entry in all cases where it is not inserted into a chain. Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- fragmentation.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fragmentation.c b/fragmentation.c index 6054ff6..ab85e75 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -129,10 +129,11 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, struct hlist_head *chain_out) { struct batadv_frag_table_entry *chain; - struct batadv_frag_list_entry *frag_entry_new, *frag_entry_curr; + struct batadv_frag_list_entry *frag_entry_new = NULL, *frag_entry_curr; struct batadv_frag_packet *frag_packet; uint8_t bucket; uint16_t seqno, hdr_size = sizeof(struct batadv_frag_packet); + bool ret = false; /* Linearize packet to avoid linearizing 16 packets in a row when doing * the later merge. Non-linear merge should be added to remove this @@ -162,6 +163,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, hlist_add_head(&frag_entry_new->list, &chain->head); chain->size = skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; goto out; } @@ -177,6 +179,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, &frag_entry_curr->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; goto out; } } @@ -186,6 +189,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node, hlist_add_after(&frag_entry_curr->list, &frag_entry_new->list); chain->size += skb->len - hdr_size; chain->timestamp = jiffies; + ret = true; } out: @@ -202,14 +206,14 @@ out: chain->size = 0; } - spin_unlock_bh(&chain->lock); - return true; - err_unlock: spin_unlock_bh(&chain->lock); - kfree(frag_entry_new); + err: - return false; + if (!ret) + kfree(frag_entry_new); + + return ret; } /** -- 1.8.3

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: remove useless find_router look up
by Simon Wunderlich 04 Jun '13

04 Jun '13

From: Simon Wunderlich <simon(a)open-mesh.com> This is not used anymore with the new fragmentation, and it might actually mess up the bonding code because find_router() assumes it is only called once per packet. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- This patch was originally part of the RFC series "add network wide multi interface optimization", but since it is just a fix it is resent as PATCH to be applied now. --- send.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/send.c b/send.c index 8f74201..d780b9d 100644 --- a/send.c +++ b/send.c @@ -251,30 +251,19 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv, struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct batadv_unicast_packet *unicast_packet; struct batadv_orig_node *orig_node; - struct batadv_neigh_node *neigh_node; int ret = NET_RX_DROP; /* get routing information */ - if (is_multicast_ether_addr(ethhdr->h_dest)) { + if (is_multicast_ether_addr(ethhdr->h_dest)) orig_node = batadv_gw_get_selected_orig(bat_priv); - if (orig_node) - goto find_router; - } + else + /* check for tt host - increases orig_node refcount. + * returns NULL in case of AP isolation + */ + orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source, + ethhdr->h_dest); - /* check for tt host - increases orig_node refcount. - * returns NULL in case of AP isolation - */ - orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source, - ethhdr->h_dest); - -find_router: - /* find_router(): - * - if orig_node is NULL it returns NULL - * - increases neigh_nodes refcount if found. - */ - neigh_node = batadv_find_router(bat_priv, orig_node, NULL); - - if (!neigh_node) + if (!orig_node) goto out; switch (packet_type) { @@ -306,8 +295,6 @@ find_router: ret = 0; out: - if (neigh_node) - batadv_neigh_node_free_ref(neigh_node); if (orig_node) batadv_orig_node_free_ref(orig_node); if (ret == NET_RX_DROP) -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCH maint] batman-adv: wait for rtnl in batadv_store_mesh_iface instead of failing if it is taken
by Matthias Schiffer 04 Jun '13

04 Jun '13

The rtnl_lock in batadv_store_mesh_iface has been converted to a rtnl_trylock some time ago to avoid a possible deadlock between rtnl and s_active on removal of the sysfs nodes. The behaviour introduced by that was quite confusing as it could lead to the sysfs store to fail, making batman-adv setup scripts unreliable. As recently the sysfs removal was postponed to a worker not running with the rtnl taken, the deadlock can't occur any more and it is safe to change the trylock back to a lock to make the sysfs store reliable again. Signed-off-by: Matthias Schiffer <mschiffer(a)universe-factory.net> --- sysfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sysfs.c b/sysfs.c index 15a22ef..929e304 100644 --- a/sysfs.c +++ b/sysfs.c @@ -582,10 +582,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, (strncmp(hard_iface->soft_iface->name, buff, IFNAMSIZ) == 0)) goto out; - if (!rtnl_trylock()) { - ret = -ERESTARTSYS; - goto out; - } + rtnl_lock(); if (status_tmp == BATADV_IF_NOT_IN_USE) { batadv_hardif_disable_interface(hard_iface, -- 1.8.3

3 2

[B.A.T.M.A.N.] [PATCH] batman-adv: remove obsolete variable
by Marek Lindner 04 Jun '13

04 Jun '13

Introduced by 1ab746a3f2441d3466592b86134fbc72a9fe0558 ("batman-adv: properly align tvlv infrastructure") Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.c b/main.c index 1192e61..5d30fe0 100644 --- a/main.c +++ b/main.c @@ -1043,7 +1043,7 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, struct batadv_orig_node *orig_node; struct sk_buff *skb = NULL; unsigned char *tvlv_buff; - unsigned int tvlv_len, tvlv_long_hdr = 0; + unsigned int tvlv_len; ssize_t hdr_len = sizeof(*unicast_tvlv_packet); bool ret = false; @@ -1051,9 +1051,6 @@ void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, if (!orig_node) goto out; - if (tvlv_value_len > 255) - tvlv_long_hdr = 1; - tvlv_len = sizeof(*tvlv_hdr) + tvlv_value_len; skb = netdev_alloc_skb_ip_align(NULL, ETH_HLEN + hdr_len + tvlv_len); -- 1.7.10.4

1 1

[B.A.T.M.A.N.] [PATCHv3 00/12] make the Translation Table component VLAN-aware
by Antonio Quartulli 04 Jun '13

04 Jun '13

Hello people, with this patchset I want to introduce a new feature in the TT code which makes it VLAN aware. This means that now clients belonging to different VLANs created on top of a generic bat0 are treated differently. One of the major reason for bringing this change is to allow BLA to selectively ignore TT entries belonging to a given VLAN. To allow the latter behaviour, the CRC logic has been divided on a per-VLAN basis. This means that the local TT table is logically divided in sub-tables containing all the entries belonging to the same VLAN and the CRC is then computed on each of them. As a natural consequence, each node now stores a set of local CRCs instead of one only. Due to this also the way the TVLV-TT object is built and announced has been changed. This patchset gives the possibility to: - enable AP isolation only on a selected VLAN rather than on all the traffic - make DAT work correctly when the same IP subnet is used on different VLANs - make BLA refuse global entries from certain VLANs - leave the possibility to future developers to implement more VLAN specific attributes This patchset is based on top of: "batman-adv: fix typo in kernel doc" Changes from v2: - CRC logic divided on a VLAN-basis - BLA can now select the TT entries to ignore based on the VLAN Changes from v1: - improved kernel doc - created batadv_get_vid() function - improved documentation for CRC computation - added compat code for kfree_rcu (struct batadv_priv_vlan) Cheers, Antonio Quartulli (12): batman-adv: implement batadv_tt_entries batman-adv: avoid cast by using void pointer as argument batman-adv: add the VLAN ID attribute to the TT entry batman-adv: use vid when computing local and global TT CRC batman-adv: print the VID together with the TT entries batman-adv: make the GW module correctly talk to the new VLAN-TT batman-adv: make the Distributed ARP Table vlan aware batman-adv: add per VLAN interface attribute framework batman-adv: make the AP isolation attribute VLAN specific batman-adv: make the backbone gw check VLAN specific batman-adv: make the TT global purge routine VLAN specific batman-adv: make the TT RC logic VLAN specific bridge_loop_avoidance.c | 58 ++- bridge_loop_avoidance.h | 10 +- compat.c | 18 + compat.h | 25 ++ distributed-arp-table.c | 125 ++++-- gateway_client.c | 18 +- main.c | 72 +++- main.h | 13 +- originator.c | 100 ++++- originator.h | 7 + packet.h | 30 +- routing.c | 28 +- send.c | 8 +- send.h | 16 +- soft-interface.c | 158 ++++++- sysfs.c | 140 ++++++ sysfs.h | 10 + translation-table.c | 1080 +++++++++++++++++++++++++++++++++++------------ translation-table.h | 23 +- types.h | 66 ++- 20 files changed, 1599 insertions(+), 406 deletions(-) -- 1.8.1.5

2 17

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

30 May '13

Hello David, this is again our pull request intended for net-next/linux-3.11. Apparently my mail server decided that 14/21 was spam and refused all the subsequent emails. It's a first step towards the automatic kernel maintenance :-) Again: 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 23

[B.A.T.M.A.N.] alfred and ipv6
by cmsv 30 May '13

30 May '13

As i am about to try out alfred i already face myself with a couple issues: http://www.open-mesh.org/projects/open-mesh/wiki/Alfred http://git.open-mesh.org/alfred.git/blob_plain/refs/heads/master:/README I the past i had removed ipv6 support since i do not need it and it helps trimming up the final image. (most routers and people still use 4 mb flash) I would like to use alfred and would also like to know if compiling the image with <*> kmod-ipv6................................................... IPv6 support Leaving out : [ ] ping6 [ ] Enable IPv6 support [ ] Enable IPv6 support in packages will allow Alfred to work as intended. As anyone tested? Another problem with using ipv6 is the final image size. kmod-ipv6_3.3.8-1_ar71xx.ipk is at least 138K An that is quite a bit ... What are exactly the reasons why alfred does not use ipv4 ? -- Site: http://wirelesspt.net Mesh: http://tinyurl.com/wirelesspt Admin: http://wirelesspt.net/wiki/Cmsv Twitter: http://twitter.com/wirelesspt Suporte técnico via sms: 91 19 11 798 Donativos/Paypal: http://tinyurl.com/doar-verba Chave publica PGP/SSH: http://wirelesspt.net/arquivos/pk Email assinado digitalmente pelo emissor assegurando autenticidade

2 1

[B.A.T.M.A.N.] [PATCHv2] batctl: create common header for ICMP packets
by Antonio Quartulli 29 May '13

29 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: - added changes to packet.h packet.h | 38 ++++++++++++++++++++++++++++---------- ping.c | 24 ++++++++++++++---------- tcpdump.c | 27 +++++++++++++++++---------- traceroute.c | 31 +++++++++++++++++++------------ 4 files changed, 78 insertions(+), 42 deletions(-) diff --git a/packet.h b/packet.h index 57d2002..8b8b03f 100644 --- a/packet.h +++ b/packet.h @@ -186,29 +186,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/ping.c b/ping.c index 5d6b7e9..6679604 100644 --- a/ping.c +++ b/ping.c @@ -171,11 +171,11 @@ int ping(char *mesh_iface, int argc, char **argv) packet_len = sizeof(struct batadv_icmp_packet); - memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); - icmp_packet_out.header.packet_type = BATADV_ICMP; - icmp_packet_out.header.version = BATADV_COMPAT_VERSION; - icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; - icmp_packet_out.header.ttl = 50; + memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); + icmp_packet_out.icmph.header.packet_type = BATADV_ICMP; + icmp_packet_out.icmph.header.version = BATADV_COMPAT_VERSION; + icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; + icmp_packet_out.icmph.header.ttl = 50; icmp_packet_out.seqno = 0; if (rr) { @@ -245,12 +245,14 @@ read_packet: if (htons(seq_counter) != icmp_packet_in.seqno) goto read_packet; - switch (icmp_packet_in.msg_type) { + switch (icmp_packet_in.icmph.msg_type) { case BATADV_ECHO_REPLY: time_delta = end_timer(); printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms", - read_len, dst_string, ntohs(icmp_packet_in.seqno), - icmp_packet_in.header.ttl, time_delta); + read_len, dst_string, + ntohs(icmp_packet_in.seqno), + icmp_packet_in.icmph.header.ttl, + time_delta); if (read_len == sizeof(struct batadv_icmp_packet_rr)) { if (last_rr_cur == icmp_packet_in.rr_cur @@ -299,11 +301,13 @@ read_packet: break; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.header.version, BATADV_COMPAT_VERSION); + icmp_packet_in.icmph.header.version, + BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; default: - printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); + printf("Unknown message type %d len %zd received\n", + icmp_packet_in.icmph.msg_type, read_len); break; } diff --git a/tcpdump.c b/tcpdump.c index 3e932cd..7e0987b 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -361,32 +361,39 @@ static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int r if (!time_printed) print_time(); - printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)icmp_packet->orig, read_opt)); + printf("BAT %s > ", + get_name_by_macaddr((struct ether_addr *)icmp_packet->icmph.orig, + read_opt)); - name = get_name_by_macaddr((struct ether_addr *)icmp_packet->dst, read_opt); + name = get_name_by_macaddr((struct ether_addr *)icmp_packet->icmph.dst, + read_opt); - switch (icmp_packet->msg_type) { + switch (icmp_packet->icmph.msg_type) { case BATADV_ECHO_REPLY: printf("%s: ICMP echo reply, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->uid, ntohs(icmp_packet->seqno), - icmp_packet->header.ttl, icmp_packet->header.version, + name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), + icmp_packet->icmph.header.ttl, + icmp_packet->icmph.header.version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_ECHO_REQUEST: printf("%s: ICMP echo request, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->uid, ntohs(icmp_packet->seqno), - icmp_packet->header.ttl, icmp_packet->header.version, + name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), + icmp_packet->icmph.header.ttl, + icmp_packet->icmph.header.version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_TTL_EXCEEDED: printf("%s: ICMP time exceeded in-transit, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->uid, ntohs(icmp_packet->seqno), - icmp_packet->header.ttl, icmp_packet->header.version, + name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), + icmp_packet->icmph.header.ttl, + icmp_packet->icmph.header.version, (size_t)buff_len - sizeof(struct ether_header)); break; default: printf("%s: ICMP type %hhu, length %zu\n", - name, icmp_packet->msg_type, (size_t)buff_len - sizeof(struct ether_header)); + name, icmp_packet->icmph.msg_type, + (size_t)buff_len - sizeof(struct ether_header)); break; } } diff --git a/traceroute.c b/traceroute.c index 38d3796..362d293 100644 --- a/traceroute.c +++ b/traceroute.c @@ -129,17 +129,19 @@ int traceroute(char *mesh_iface, int argc, char **argv) goto out; } - memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); - icmp_packet_out.header.version = BATADV_COMPAT_VERSION; - icmp_packet_out.header.packet_type = BATADV_ICMP; - icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; + memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); + icmp_packet_out.icmph.header.version = BATADV_COMPAT_VERSION; + icmp_packet_out.icmph.header.packet_type = BATADV_ICMP; + icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; icmp_packet_out.seqno = 0; icmp_packet_out.reserved = 0; printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); - for (icmp_packet_out.header.ttl = 1; !dst_reached && icmp_packet_out.header.ttl < TTL_MAX; icmp_packet_out.header.ttl++) { + for (icmp_packet_out.icmph.header.ttl = 1; + !dst_reached && icmp_packet_out.icmph.header.ttl < TTL_MAX; + icmp_packet_out.icmph.header.ttl++) { return_mac = NULL; bat_host = NULL; @@ -183,7 +185,7 @@ read_packet: if (htons(seq_counter) != icmp_packet_in.seqno) goto read_packet; - switch (icmp_packet_in.msg_type) { + switch (icmp_packet_in.icmph.msg_type) { case BATADV_ECHO_REPLY: dst_reached = 1; /* fall through */ @@ -191,10 +193,10 @@ read_packet: time_delta[i] = end_timer(); if (!return_mac) { - return_mac = ether_ntoa_long((struct ether_addr *)&icmp_packet_in.orig); + return_mac = ether_ntoa_long((struct ether_addr *)&icmp_packet_in.icmph.orig); if (read_opt & USE_BAT_HOSTS) - bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.orig); + bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.icmph.orig); } break; @@ -203,19 +205,24 @@ read_packet: goto out; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.header.version, BATADV_COMPAT_VERSION); + icmp_packet_in.icmph.header.version, + BATADV_COMPAT_VERSION); fprintf(stderr, "Please make sure to use compatible versions!\n"); goto out; default: - printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); + printf("Unknown message type %d len %zd received\n", + icmp_packet_in.icmph.msg_type, read_len); break; } } if (!bat_host) - printf("%2hhu: %s", icmp_packet_out.header.ttl, (return_mac ? return_mac : "*")); + printf("%2hhu: %s", icmp_packet_out.icmph.header.ttl, + (return_mac ? return_mac : "*")); else - printf("%2hhu: %s (%s)", icmp_packet_out.header.ttl, bat_host->name, return_mac); + printf("%2hhu: %s (%s)", + icmp_packet_out.icmph.header.ttl, + bat_host->name, return_mac); for (i = 0; i < NUM_PACKETS; i++) { if (time_delta[i]) -- 1.8.1.5

2 1

[B.A.T.M.A.N.] [PATCH] batctl: create common header for ICMP packets
by Antonio Quartulli 29 May '13

29 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> --- This patch assumes that ("batman-adv: fix typo in kernel doc") and ("batman-adv: correctly align the tt_tvlv_data struct") have been applied to batctl too. ping.c | 24 ++++++++++++++---------- tcpdump.c | 27 +++++++++++++++++---------- traceroute.c | 31 +++++++++++++++++++------------ 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/ping.c b/ping.c index 5d6b7e9..6679604 100644 --- a/ping.c +++ b/ping.c @@ -171,11 +171,11 @@ int ping(char *mesh_iface, int argc, char **argv) packet_len = sizeof(struct batadv_icmp_packet); - memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); - icmp_packet_out.header.packet_type = BATADV_ICMP; - icmp_packet_out.header.version = BATADV_COMPAT_VERSION; - icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; - icmp_packet_out.header.ttl = 50; + memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); + icmp_packet_out.icmph.header.packet_type = BATADV_ICMP; + icmp_packet_out.icmph.header.version = BATADV_COMPAT_VERSION; + icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; + icmp_packet_out.icmph.header.ttl = 50; icmp_packet_out.seqno = 0; if (rr) { @@ -245,12 +245,14 @@ read_packet: if (htons(seq_counter) != icmp_packet_in.seqno) goto read_packet; - switch (icmp_packet_in.msg_type) { + switch (icmp_packet_in.icmph.msg_type) { case BATADV_ECHO_REPLY: time_delta = end_timer(); printf("%zd bytes from %s icmp_seq=%hu ttl=%d time=%.2f ms", - read_len, dst_string, ntohs(icmp_packet_in.seqno), - icmp_packet_in.header.ttl, time_delta); + read_len, dst_string, + ntohs(icmp_packet_in.seqno), + icmp_packet_in.icmph.header.ttl, + time_delta); if (read_len == sizeof(struct batadv_icmp_packet_rr)) { if (last_rr_cur == icmp_packet_in.rr_cur @@ -299,11 +301,13 @@ read_packet: break; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.header.version, BATADV_COMPAT_VERSION); + icmp_packet_in.icmph.header.version, + BATADV_COMPAT_VERSION); printf("Please make sure to use compatible versions!\n"); goto out; default: - printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); + printf("Unknown message type %d len %zd received\n", + icmp_packet_in.icmph.msg_type, read_len); break; } diff --git a/tcpdump.c b/tcpdump.c index 3e932cd..7e0987b 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -361,32 +361,39 @@ static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int r if (!time_printed) print_time(); - printf("BAT %s > ", get_name_by_macaddr((struct ether_addr *)icmp_packet->orig, read_opt)); + printf("BAT %s > ", + get_name_by_macaddr((struct ether_addr *)icmp_packet->icmph.orig, + read_opt)); - name = get_name_by_macaddr((struct ether_addr *)icmp_packet->dst, read_opt); + name = get_name_by_macaddr((struct ether_addr *)icmp_packet->icmph.dst, + read_opt); - switch (icmp_packet->msg_type) { + switch (icmp_packet->icmph.msg_type) { case BATADV_ECHO_REPLY: printf("%s: ICMP echo reply, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->uid, ntohs(icmp_packet->seqno), - icmp_packet->header.ttl, icmp_packet->header.version, + name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), + icmp_packet->icmph.header.ttl, + icmp_packet->icmph.header.version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_ECHO_REQUEST: printf("%s: ICMP echo request, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->uid, ntohs(icmp_packet->seqno), - icmp_packet->header.ttl, icmp_packet->header.version, + name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), + icmp_packet->icmph.header.ttl, + icmp_packet->icmph.header.version, (size_t)buff_len - sizeof(struct ether_header)); break; case BATADV_TTL_EXCEEDED: printf("%s: ICMP time exceeded in-transit, id %hhu, seq %hu, ttl %2d, v %d, length %zu\n", - name, icmp_packet->uid, ntohs(icmp_packet->seqno), - icmp_packet->header.ttl, icmp_packet->header.version, + name, icmp_packet->icmph.uid, ntohs(icmp_packet->seqno), + icmp_packet->icmph.header.ttl, + icmp_packet->icmph.header.version, (size_t)buff_len - sizeof(struct ether_header)); break; default: printf("%s: ICMP type %hhu, length %zu\n", - name, icmp_packet->msg_type, (size_t)buff_len - sizeof(struct ether_header)); + name, icmp_packet->icmph.msg_type, + (size_t)buff_len - sizeof(struct ether_header)); break; } } diff --git a/traceroute.c b/traceroute.c index 38d3796..362d293 100644 --- a/traceroute.c +++ b/traceroute.c @@ -129,17 +129,19 @@ int traceroute(char *mesh_iface, int argc, char **argv) goto out; } - memcpy(&icmp_packet_out.dst, dst_mac, ETH_ALEN); - icmp_packet_out.header.version = BATADV_COMPAT_VERSION; - icmp_packet_out.header.packet_type = BATADV_ICMP; - icmp_packet_out.msg_type = BATADV_ECHO_REQUEST; + memcpy(&icmp_packet_out.icmph.dst, dst_mac, ETH_ALEN); + icmp_packet_out.icmph.header.version = BATADV_COMPAT_VERSION; + icmp_packet_out.icmph.header.packet_type = BATADV_ICMP; + icmp_packet_out.icmph.msg_type = BATADV_ECHO_REQUEST; icmp_packet_out.seqno = 0; icmp_packet_out.reserved = 0; printf("traceroute to %s (%s), %d hops max, %zu byte packets\n", dst_string, mac_string, TTL_MAX, sizeof(icmp_packet_out)); - for (icmp_packet_out.header.ttl = 1; !dst_reached && icmp_packet_out.header.ttl < TTL_MAX; icmp_packet_out.header.ttl++) { + for (icmp_packet_out.icmph.header.ttl = 1; + !dst_reached && icmp_packet_out.icmph.header.ttl < TTL_MAX; + icmp_packet_out.icmph.header.ttl++) { return_mac = NULL; bat_host = NULL; @@ -183,7 +185,7 @@ read_packet: if (htons(seq_counter) != icmp_packet_in.seqno) goto read_packet; - switch (icmp_packet_in.msg_type) { + switch (icmp_packet_in.icmph.msg_type) { case BATADV_ECHO_REPLY: dst_reached = 1; /* fall through */ @@ -191,10 +193,10 @@ read_packet: time_delta[i] = end_timer(); if (!return_mac) { - return_mac = ether_ntoa_long((struct ether_addr *)&icmp_packet_in.orig); + return_mac = ether_ntoa_long((struct ether_addr *)&icmp_packet_in.icmph.orig); if (read_opt & USE_BAT_HOSTS) - bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.orig); + bat_host = bat_hosts_find_by_mac((char *)&icmp_packet_in.icmph.orig); } break; @@ -203,19 +205,24 @@ read_packet: goto out; case BATADV_PARAMETER_PROBLEM: fprintf(stderr, "Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.header.version, BATADV_COMPAT_VERSION); + icmp_packet_in.icmph.header.version, + BATADV_COMPAT_VERSION); fprintf(stderr, "Please make sure to use compatible versions!\n"); goto out; default: - printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); + printf("Unknown message type %d len %zd received\n", + icmp_packet_in.icmph.msg_type, read_len); break; } } if (!bat_host) - printf("%2hhu: %s", icmp_packet_out.header.ttl, (return_mac ? return_mac : "*")); + printf("%2hhu: %s", icmp_packet_out.icmph.header.ttl, + (return_mac ? return_mac : "*")); else - printf("%2hhu: %s (%s)", icmp_packet_out.header.ttl, bat_host->name, return_mac); + printf("%2hhu: %s (%s)", + icmp_packet_out.icmph.header.ttl, + bat_host->name, return_mac); for (i = 0; i < NUM_PACKETS; i++) { if (time_delta[i]) -- 1.8.1.5

2 2

[B.A.T.M.A.N.] [PATCH] batman-adv: fix network order complaints in the TVLV code
by Antonio Quartulli 29 May '13

29 May '13

Intorduced by 1ab746a3f2441d3466592b86134fbc72a9fe0558 ("batman-adv: properly align tvlv infrastructure") Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index 9df71bc..1192e61 100644 --- a/main.c +++ b/main.c @@ -630,7 +630,7 @@ static uint16_t batadv_tvlv_container_list_size(struct batadv_priv *bat_priv) hlist_for_each_entry(tvlv, &bat_priv->tvlv.container_list, list) { tvlv_len += sizeof(struct batadv_tvlv_hdr); - tvlv_len += tvlv->tvlv_hdr.len; + tvlv_len += ntohs(tvlv->tvlv_hdr.len); } return tvlv_len; @@ -701,9 +701,9 @@ void batadv_tvlv_container_register(struct batadv_priv *bat_priv, tvlv_new->tvlv_hdr.version = version; tvlv_new->tvlv_hdr.type = type; - tvlv_new->tvlv_hdr.len = tvlv_value_len; + tvlv_new->tvlv_hdr.len = htons(tvlv_value_len); - memcpy(tvlv_new + 1, tvlv_value, tvlv_new->tvlv_hdr.len); + memcpy(tvlv_new + 1, tvlv_value, ntohs(tvlv_new->tvlv_hdr.len)); INIT_HLIST_NODE(&tvlv_new->list); atomic_set(&tvlv_new->refcount, 1); @@ -790,10 +790,10 @@ uint16_t batadv_tvlv_container_ogm_append(struct batadv_priv *bat_priv, 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_hdr->len = 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; + memcpy(tvlv_value, tvlv + 1, ntohs(tvlv->tvlv_hdr.len)); + tvlv_value = (uint8_t *)tvlv_value + ntohs(tvlv->tvlv_hdr.len); } end: -- 1.8.1.5

2 1

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