B.A.T.M.A.N October 2014

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

19 participants
40 discussions

[B.A.T.M.A.N.] [PATCH] batman-adv: fix and simplify condition when bonding should be used
by Simon Wunderlich 09 Nov '14

09 Nov '14

The current condition actually does NOT consider bonding when the interface the packet came in from is the soft interface, which is the opposite of what it should do (and the comment describes). Fix that and slightly simplify the condition. Reported-by: Ray Gibson <booray(a)gmail.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> --- routing.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/routing.c b/routing.c index 35f76f2..6648f32 100644 --- a/routing.c +++ b/routing.c @@ -443,11 +443,13 @@ batadv_find_router(struct batadv_priv *bat_priv, router = batadv_orig_router_get(orig_node, recv_if); + if (!router) + return router; + /* only consider bonding for recv_if == BATADV_IF_DEFAULT (first hop) * and if activated. */ - if (recv_if == BATADV_IF_DEFAULT || !atomic_read(&bat_priv->bonding) || - !router) + if (!(recv_if == BATADV_IF_DEFAULT && atomic_read(&bat_priv->bonding))) return router; /* bonding: loop through the list of possible routers found -- 2.1.0.rc1

2 1

[B.A.T.M.A.N.] [PATCH 1/5] batman-adv: checkpatch - else is not generally useful after a break or return
by Antonio Quartulli 01 Nov '14

01 Nov '14

Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- bitarray.h | 3 +-- fragmentation.h | 3 +-- network-coding.c | 3 +-- translation-table.c | 5 ++--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bitarray.h b/bitarray.h index cc24073..2acaafe 100644 --- a/bitarray.h +++ b/bitarray.h @@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits, diff = last_seqno - curr_seqno; if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE) return 0; - else - return test_bit(diff, seq_bits) != 0; + return test_bit(diff, seq_bits) != 0; } /* turn corresponding bit on, so we can remember that we got the packet */ diff --git a/fragmentation.h b/fragmentation.h index 5d7a0e6..d848cf6 100644 --- a/fragmentation.h +++ b/fragmentation.h @@ -41,8 +41,7 @@ batadv_frag_check_entry(struct batadv_frag_table_entry *frags_entry) if (!hlist_empty(&frags_entry->head) && batadv_has_timed_out(frags_entry->timestamp, BATADV_FRAG_TIMEOUT)) return true; - else - return false; + return false; } #endif /* _NET_BATMAN_ADV_FRAGMENTATION_H_ */ diff --git a/network-coding.c b/network-coding.c index 8d04d17..bd33894 100644 --- a/network-coding.c +++ b/network-coding.c @@ -1212,8 +1212,7 @@ static bool batadv_nc_skb_coding_possible(struct sk_buff *skb, { if (BATADV_SKB_CB(skb)->decoded && !batadv_compare_eth(dst, src)) return false; - else - return true; + return true; } /** diff --git a/translation-table.c b/translation-table.c index 5f59e7f..38a804e 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2769,9 +2769,8 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv, { if (batadv_is_my_mac(bat_priv, req_dst)) return batadv_send_my_tt_response(bat_priv, tt_data, req_src); - else - return batadv_send_other_tt_response(bat_priv, tt_data, - req_src, req_dst); + return batadv_send_other_tt_response(bat_priv, tt_data, req_src, + req_dst); } static void _batadv_tt_update_changes(struct batadv_priv *bat_priv, -- 1.8.5.5

2 9

[B.A.T.M.A.N.] [PATCHv4] batctl: tcpdump - parse TVLV containers
by Antonio Quartulli 01 Nov '14

01 Nov '14

From: Antonio Quartulli <antonio(a)open-mesh.com> OGMs and unicast TVLV packets carry TVLV containers as payload. With this patch such containers are now parsed and the relevant information is printed to screen. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- changes since v3: - undo unneeded style change in tcpdump.c - remove unneeded sentence about style change sin commit message changes since v2: - extended doc in README and manpage changes since v1: - remove all the style changes - make tvlv_len of type ssize_t in dump_batman_iv_ogm() README | 1 + main.h | 7 +++ man/batctl.8 | 3 ++ tcpdump.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- tcpdump.h | 1 + 5 files changed, 177 insertions(+), 4 deletions(-) diff --git a/README b/README index b5fd259..f87c551 100644 --- a/README +++ b/README @@ -161,6 +161,7 @@ packet types: 2 - batman icmp packets 4 - batman unicast packets 8 - batman broadcast packets + 16 - batman unicast tvlv packets 32 - batman fragmented packets 64 - batman tt / roaming packets 128 - non batman packets diff --git a/main.h b/main.h index 839c1c7..b16afb6 100644 --- a/main.h +++ b/main.h @@ -49,4 +49,11 @@ extern char module_ver_path[]; +#ifndef VLAN_VID_MASK +#define VLAN_VID_MASK 0xfff +#endif + +#define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ + (int)(vid & VLAN_VID_MASK) : -1) + #endif diff --git a/man/batctl.8 b/man/batctl.8 index 110020e..8d2de19 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -288,6 +288,9 @@ except specified). The following packet types are available: 8 - batman broadcast packets .RE .RS 16 +16 - batman unicast tvlv packets +.RE +.RS 16 32 - batman fragmented packets .RE .RS 16 diff --git a/tcpdump.c b/tcpdump.c index e84617e..d510ae4 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -63,7 +63,7 @@ if ((size_t)(buff_len) < (check_len)) { \ } static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | - DUMP_TYPE_BATBCAST | DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; + DUMP_TYPE_BATBCAST | DUMP_TYPE_BATUTVLV | DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; static unsigned short dump_level; static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed); @@ -83,6 +83,7 @@ static void tcpdump_usage(void) fprintf(stderr, " \t\t%3d - batman unicast packets\n", DUMP_TYPE_BATUCAST); fprintf(stderr, " \t\t%3d - batman broadcast packets\n", DUMP_TYPE_BATBCAST); fprintf(stderr, " \t\t%3d - batman fragmented packets\n", DUMP_TYPE_BATFRAG); + fprintf(stderr, " \t\t%3d - batman unicast tvlv packets\n", DUMP_TYPE_BATUTVLV); fprintf(stderr, " \t\t%3d - non batman packets\n", DUMP_TYPE_NONBAT); fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } @@ -99,6 +100,138 @@ static int print_time(void) return 1; } +static void batctl_tvlv_parse_gw_v1(void *buff, + ssize_t (buff_len)__attribute__((unused))) +{ + struct batadv_tvlv_gateway_data *tvlv = buff; + uint32_t down, up; + + down = ntohl(tvlv->bandwidth_down); + up = ntohl(tvlv->bandwidth_up); + + printf("\tTVLV GWv1: down %d.%.1dMbps, up %d.%1dMbps\n", + down / 10, down % 10, up / 10, up % 10); +} + +static void batctl_tvlv_parse_dat_v1(void (*buff)__attribute__((unused)), + ssize_t (buff_len)__attribute__((unused))) +{ + printf("\tTVLV DATv1: enabled\n"); +} + +static void batctl_tvlv_parse_nc_v1(void (*buff)__attribute__((unused)), + ssize_t (buff_len)__attribute__((unused))) +{ + printf("\tTVLV NCv1: enabled\n"); +} + +static void batctl_tvlv_parse_tt_v1(void *buff, + ssize_t (buff_len)__attribute__((unused))) +{ + struct batadv_tvlv_tt_data *tvlv = buff; + struct batadv_tvlv_tt_vlan_data *vlan; + int i, num_vlan, num_entry; + const char *type; + + if (tvlv->flags & BATADV_TT_OGM_DIFF) + type = "OGM DIFF"; + else if (tvlv->flags & BATADV_TT_REQUEST) + type = "TT REQUEST"; + else if (tvlv->flags & BATADV_TT_RESPONSE) + type = "TT RESPONSE"; + else + type = "UNKNOWN"; + + num_vlan = ntohs(tvlv->num_vlan); + buff_len -= sizeof(*tvlv) + sizeof(*vlan) * num_vlan; + num_entry = buff_len / sizeof(struct batadv_tvlv_tt_change); + + printf("\tTVLV TTv1: %s [%c] ttvn=%hhu vlan_num=%hu entry_num=%hu\n", + type, tvlv->flags & BATADV_TT_FULL_TABLE ? 'F' : '.', + tvlv->ttvn, num_vlan, num_entry); + + vlan = (struct batadv_tvlv_tt_vlan_data *)(tvlv + 1); + for (i = 0; i < num_vlan; i++) { + printf("\t\tVLAN ID %hd, crc %#.8x\n", + BATADV_PRINT_VID(ntohs(vlan->vid)), + ntohl(vlan->crc)); + vlan++; + } +} + +static void batctl_tvlv_parse_roam_v1(void *buff, + ssize_t (buff_len)__attribute__((unused))) +{ + struct batadv_tvlv_roam_adv *tvlv = buff; + + printf("\tTVLV ROAMv1: client %s, VLAN ID %d\n", + get_name_by_macaddr((struct ether_addr *)tvlv->client, NO_FLAGS), + BATADV_PRINT_VID(ntohs(tvlv->vid))); +} + +typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len); + +/* location [i][j] contains the parsing function for TVLV of type 'i' and + * version 'j + 1' + */ +batctl_tvlv_parser_t tvlv_parsers[][1] = { + [BATADV_TVLV_GW][0] = batctl_tvlv_parse_gw_v1, + [BATADV_TVLV_DAT][0] = batctl_tvlv_parse_dat_v1, + [BATADV_TVLV_NC][0] = batctl_tvlv_parse_nc_v1, + [BATADV_TVLV_TT][0] = batctl_tvlv_parse_tt_v1, + [BATADV_TVLV_ROAM][0] = batctl_tvlv_parse_roam_v1, +}; + +static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, + int read_opt, int time_printed) +{ + struct batadv_unicast_tvlv_packet *tvlv_packet; + struct batadv_tvlv_hdr *tvlv_hdr; + struct ether_header *ether_header; + struct ether_addr *src, *dst; + batctl_tvlv_parser_t parser; + ssize_t check_len, tvlv_len, len; + uint8_t *ptr; + + check_len = (size_t)buff_len - sizeof(struct ether_header); + + LEN_CHECK(check_len, sizeof(*tvlv_packet), "BAT TVLV"); + check_len -= sizeof(*tvlv_packet); + + ether_header = (struct ether_header *)packet_buff; + tvlv_packet = (struct batadv_unicast_tvlv_packet *)(ether_header + 1); + + LEN_CHECK(check_len, (size_t)ntohs(tvlv_packet->tvlv_len), + "BAT TVLV (containers)"); + + if (!time_printed) + time_printed = print_time(); + + src = (struct ether_addr *)tvlv_packet->src; + printf("BAT %s > ", get_name_by_macaddr(src, read_opt)); + + dst = (struct ether_addr *)tvlv_packet->dst; + tvlv_len = ntohs(tvlv_packet->tvlv_len); + printf("%s: TVLV, len %zu, tvlv_len %zu, ttl %hhu\n", + get_name_by_macaddr(dst, read_opt), + buff_len - sizeof(struct ether_header), tvlv_len, + tvlv_packet->ttl); + + ptr = (uint8_t *)(tvlv_packet + 1); + + while (tvlv_len > 0) { + tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; + len = ntohs(tvlv_hdr->len); + + parser = tvlv_parsers[tvlv_hdr->type][tvlv_hdr->version - 1]; + parser(tvlv_hdr + 1, len); + + /* go to the next container */ + ptr = (uint8_t *)(tvlv_hdr + 1) + len; + tvlv_len -= sizeof(*tvlv_hdr) + len; + } +} + static int dump_bla2_claim(struct ether_header *eth_hdr, struct ether_arp *arphdr, int read_opt) { @@ -482,8 +615,13 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int { struct ether_header *ether_header; struct batadv_ogm_packet *batman_ogm_packet; + struct batadv_tvlv_hdr *tvlv_hdr; + ssize_t tvlv_len, len, check_len; + batctl_tvlv_parser_t parser; + uint8_t *ptr; - LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct batadv_ogm_packet), "BAT IV OGM"); + check_len = (size_t)buff_len - sizeof(struct ether_header); + LEN_CHECK(check_len, sizeof(struct batadv_ogm_packet), "BAT IV OGM"); ether_header = (struct ether_header *)packet_buff; batman_ogm_packet = (struct batadv_ogm_packet *)(packet_buff + sizeof(struct ether_header)); @@ -494,14 +632,32 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int printf("BAT %s: ", get_name_by_macaddr((struct ether_addr *)batman_ogm_packet->orig, read_opt)); - printf("OGM IV via neigh %s, seq %u, tq %3d, ttl %2d, v %d, flags [%c%c%c], length %zu\n", + tvlv_len = ntohs(batman_ogm_packet->tvlv_len); + printf("OGM IV via neigh %s, seq %u, tq %3d, ttl %2d, v %d, flags [%c%c%c], length %zu, tvlv_len %zu\n", get_name_by_macaddr((struct ether_addr *)ether_header->ether_shost, read_opt), ntohl(batman_ogm_packet->seqno), batman_ogm_packet->tq, batman_ogm_packet->ttl, batman_ogm_packet->version, (batman_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP ? 'N' : '.'), (batman_ogm_packet->flags & BATADV_DIRECTLINK ? 'D' : '.'), (batman_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP ? 'F' : '.'), - (size_t)buff_len - sizeof(struct ether_header)); + check_len, tvlv_len); + + check_len -= sizeof(struct batadv_ogm_packet); + LEN_CHECK(check_len, tvlv_len, "BAT OGM TVLV (containers)"); + + ptr = (uint8_t *)(batman_ogm_packet + 1); + + while (tvlv_len > 0) { + tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; + len = ntohs(tvlv_hdr->len); + + parser = tvlv_parsers[tvlv_hdr->type][tvlv_hdr->version - 1]; + parser(tvlv_hdr + 1, len); + + /* go to the next container */ + ptr = (uint8_t *)(tvlv_hdr + 1) + len; + tvlv_len -= sizeof(*tvlv_hdr) + len; + } } static void dump_batman_icmp(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) @@ -683,6 +839,11 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read case BATADV_UNICAST_4ADDR: if (dump_level & DUMP_TYPE_BATUCAST) dump_batman_4addr(packet_buff, buff_len, read_opt, time_printed); + case BATADV_UNICAST_TVLV: + if ((dump_level & DUMP_TYPE_BATUCAST) || + (dump_level & DUMP_TYPE_BATUTVLV)) + dump_batman_ucast_tvlv(packet_buff, buff_len, + read_opt, time_printed); break; default: fprintf(stderr, "Warning - packet contains unknown batman packet type: 0x%02x\n", batman_ogm_packet->packet_type); diff --git a/tcpdump.h b/tcpdump.h index cfb1c69..5d936f2 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -41,6 +41,7 @@ #define DUMP_TYPE_BATICMP 2 #define DUMP_TYPE_BATUCAST 4 #define DUMP_TYPE_BATBCAST 8 +#define DUMP_TYPE_BATUTVLV 16 #define DUMP_TYPE_BATFRAG 32 #define DUMP_TYPE_NONBAT 128 -- 1.8.5.5

2 1

[B.A.T.M.A.N.] Reading batman-adv buffer
by Krishnathiepan Rasanayagam 31 Oct '14

31 Oct '14

Hi all, Does anyone knows how we can read data from batman-adv transmission buffer. before it transmits. Can we change the buffer ? Any details about the way batman-adv is using the buffer is valuable. Please update me. thanx in advance -- Best regards, Krishna.

2 1

[B.A.T.M.A.N.] Local Clients Expiring from Translation Table
by Jon Fink 21 Oct '14

21 Oct '14

I'm experiencing some issues where clients connected to a batman node (through a wired interface) are expiring from the local translation table after a period of inactivity. I'm guessing this is an intentional feature to support roaming but I'm wondering if there is a way to stop this behavior for certain MAC addresses. Some more detail of my setup: * I have multiple mesh nodes named pico9, pico17, pico24, pico41, etc... * Each node is running BATMAN 2014.2.0 attached to a wireless device. * Each node is also bridging the batman device with its local ethernet device. * A subset of the nodes are then connected to the same wired backbone, lets say pico9/17/24 are all on this backbone. * I have my laptop also connected to the backbone and I am able to successfully connect to any of the BATMAN nodes (over the wired backbone or to other nodes via the wireless mesh). pico41 (not on the backbone) has a wired client connected to it, lets call it clientA I can initially connect to clientA from my laptop and it shows up correctly in pico41's local translation table. However if I do not continually send data (ping, ssh, etc) between my laptop and clientA, I see the "last seen" column of pico41's local translation table entry increase. Eventually, clientA is removed from the table and I am not able to connect to it (ping or ssh) until I "do something" to trigger some traffic from clientA onto the mesh network. This is problematic because it requires either physically accessing clientA (not practical in our application) or manually ssh'ing into the node running batman and then connecting to clientA (makes for a challenging use-case) Is this expiration from the local translation expected? I've thought of a few hacks (make certain entries in the local translation table permanent, have a script on clientA which continually generates traffic) but I'm hoping someone else has thought about this same problem. Thanks!

2 1

[B.A.T.M.A.N.] QoS tagging
by Krishnathiepan Rasanayagam 20 Oct '14

20 Oct '14

Hi Guys, is anyone working in batman-adv for tagging packets for QoS. Lke tagging VOIP packets? -- Best regards, Krishna.

1 0

[B.A.T.M.A.N.] Changing interval of OGM
by Krishnathiepan Rasanayagam 19 Oct '14

19 Oct '14

Hi guys, Is there any possible ways to change the time where ogm's are broadcasted in batman-adv algorithm. -- Best regards, Krishna.

2 1

[B.A.T.M.A.N.] good dual radio node?
by dan 15 Oct '14

15 Oct '14

Anyone have any recommendations for a good dual radio mesh node for batman-adv that won't break the bank? I'm looking at having wired clients, but two mesh radios to keep throughput high. 802.11n radios also required. Thanks!

4 7

[B.A.T.M.A.N.] Mobile voice communication over mesh networks
by tjhowse 14 Oct '14

14 Oct '14

Has anyone looked into either a piece of hardware or a smarphone app that would allow for functionality similar to CB radios but over a wifi mesh fabric?

3 3

Re: [B.A.T.M.A.N.] batman-adv bonding feature - unable to get data packets fragmented into multiple wireless interfaces
by Simon Wunderlich 13 Oct '14

13 Oct '14

Hello Syed, thanks for testing. Please don't send HTML mails to the mailing list, they will get rejected. Thank you Simon On Monday 13 October 2014 08:26:59 syedmoulana47 wrote: > I am using batman-adv: 2012.5.0. I tried with version 2014.3.0 also. > > Even without enabling bonding sometimes I can see simultaneous outbound udp > traffic in both interfaces wlan0 and wlan1. > > I will try with the patch and update. > > Thanks. > > Sent from my Xiaomi > > On 11 Oct 2014 03:03, Simon Wunderlich <sw(a)simonwunderlich.de> wrote: > Hey Syed, > > which version of batman-adv are you using? > > Please note there is a fix for a bonding problem which hasn't been merged > yet, please merge it manually for your tests (assuming you are using a > recent version) > > https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2014-August/012382.html > > Also bonding has nothing to do with fragmentation - the idea of bonding is > that the packets should not be split, but get sent interleaved over the > interfaces, e.g. > > * wlan 1 - packet 1 > * wlan 2 - packet 2 > * wlan 1 - packet 3 > * wlan 2 - packet 4 > * etc ... > > To have a real gain from that, the two links must be equally good quality. > Also deep queues in the driver may cause reordering of packets which will > upset TCP. The best results I've seen in the past were 50% performance gain > over a single link, but I didn't try it out in real world scenarios lately. > > Thanks, > Simon > On Tuesday 07 October 2014 17:27:50 syed moulana wrote: > > > hi > > > > I tested the throughput between point to point mesh nodes using single > > and 2 radios. > > > > 1. Using single radio (ch 5180) the resulting throughput for HT40+ > > > > TCP max 250mbit/s > > UDP - max 320mbit/s > > > > > > 2. Using 2 radios with and without batctl bonding enabled (ch 5180 for > > wlan0, ch 5785 for wlan1), the resulting throughput for HT40+ is same. > > > > with batctl bonding and fragmentation enabled I believed I > > > > should be getting 50% gain in througput. > > > > When I monitor the wlan0 and wlan1 interfaces using batctl tcpdump > > > > -p 4 wlanx I can see that iperf data are interleaved. > > > > There is no splitting of data frames into 2 wireless interfaces. > > > > > > Please advice > > > > Tq > > > > Syed

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N October 2014