B.A.T.M.A.N June 2014

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

34 participants
53 discussions

[B.A.T.M.A.N.] [PATCH] batctl: tcpdump - parse TVLV containers
by Antonio Quartulli 26 Jun '14

26 Jun '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. Moreover, the parts of code that have been touched by this patch have also been re-arranged a bit from the style point of view. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> --- main.h | 7 +++ tcpdump.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- tcpdump.h | 13 ++-- 3 files changed, 199 insertions(+), 20 deletions(-) diff --git a/main.h b/main.h index c68801a..1c444dd 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/tcpdump.c b/tcpdump.c index 47081b6..c63765d 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -62,29 +62,40 @@ if ((size_t)(buff_len) < (check_len)) { \ return; \ } -static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATICMP | DUMP_TYPE_BATUCAST | - DUMP_TYPE_BATBCAST | DUMP_TYPE_BATFRAG | DUMP_TYPE_NONBAT; +static unsigned short dump_level_all = DUMP_TYPE_BATOGM | DUMP_TYPE_BATICMP | + DUMP_TYPE_BATUCAST | DUMP_TYPE_BATBCAST | + DUMP_TYPE_BATFRAG | DUMP_TYPE_BATUTVLV | + 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); static void tcpdump_usage(void) { - fprintf(stderr, "Usage: batctl tcpdump [parameters] interface [interface]\n"); + fprintf(stderr, + "Usage: batctl tcpdump [parameters] interface [interface]\n"); fprintf(stderr, "parameters:\n"); - fprintf(stderr, " \t -c compat filter - only display packets matching own compat version (%i)\n", BATADV_COMPAT_VERSION); + fprintf(stderr, + " \t -c compat filter - only display packets matching own compat version (%i)\n", + BATADV_COMPAT_VERSION); fprintf(stderr, " \t -h print this help\n"); fprintf(stderr, " \t -n don't convert addresses to bat-host names\n"); fprintf(stderr, " \t -p dump specific packet type\n"); fprintf(stderr, " \t -x dump all packet types except specified\n"); fprintf(stderr, "packet types:\n"); - fprintf(stderr, " \t\t%3d - batman ogm packets\n", DUMP_TYPE_BATOGM); - fprintf(stderr, " \t\t%3d - batman icmp packets\n", DUMP_TYPE_BATICMP); - 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 - non batman packets\n", DUMP_TYPE_NONBAT); - fprintf(stderr, " \t\t%3d - batman ogm & non batman packets\n", DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); + fprintf(stderr, " \t\t%3ld - batman ogm packets\n", DUMP_TYPE_BATOGM); + fprintf(stderr, " \t\t%3ld - batman icmp packets\n", DUMP_TYPE_BATICMP); + fprintf(stderr, " \t\t%3ld - batman unicast packets\n", + DUMP_TYPE_BATUCAST); + fprintf(stderr, " \t\t%3ld - batman broadcast packets\n", + DUMP_TYPE_BATBCAST); + fprintf(stderr, " \t\t%3ld - batman fragmented packets\n", + DUMP_TYPE_BATFRAG); + fprintf(stderr, " \t\t%3ld - batman unicast tvlv packets\n", + DUMP_TYPE_BATUTVLV); + fprintf(stderr, " \t\t%3ld - non batman packets\n", DUMP_TYPE_NONBAT); + fprintf(stderr, " \t\t%3ld - batman ogm & non batman packets\n", + DUMP_TYPE_BATOGM | DUMP_TYPE_NONBAT); } static int print_time(void) @@ -99,6 +110,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 +625,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; + size_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 +642,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) @@ -695,6 +861,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..328f19f 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -37,12 +37,13 @@ #define ARPHRD_IEEE80211_RADIOTAP 803 #endif -#define DUMP_TYPE_BATOGM 1 -#define DUMP_TYPE_BATICMP 2 -#define DUMP_TYPE_BATUCAST 4 -#define DUMP_TYPE_BATBCAST 8 -#define DUMP_TYPE_BATFRAG 32 -#define DUMP_TYPE_NONBAT 128 +#define DUMP_TYPE_BATOGM BIT(0) +#define DUMP_TYPE_BATICMP BIT(1) +#define DUMP_TYPE_BATUCAST BIT(2) +#define DUMP_TYPE_BATBCAST BIT(3) +#define DUMP_TYPE_BATFRAG BIT(4) +#define DUMP_TYPE_BATUTVLV BIT(5) +#define DUMP_TYPE_NONBAT BIT(6) #define IEEE80211_FCTL_FTYPE 0x0c00 #define IEEE80211_FCTL_TODS 0x0001 -- 1.8.5.5

2 3

[B.A.T.M.A.N.] [PATCH] alfred: Calculate size of global buffer and not of a single char
by Sven Eckelmann 24 Jun '14

24 Jun '14

The global buffer is 65536 bytes in size and not only 1 byte. This statement evaluated to a negative value which was casted to an unsigned value (aka... very large value). This is a regression was introduced in 71dbc00fd879f1e592b07d8397f724fb3f69ac64 ("alfred: Use strncpy instead of strcpy for string"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- gpsd/alfred-gpsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 84a0ded..d6cdfd6 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -301,7 +301,7 @@ static void gpsd_read_gpsd(struct globals *globals) size_t cnt; bool eol = false; char buf[4096]; - const size_t tpv_size = sizeof(*globals->buf) - + const size_t tpv_size = sizeof(globals->buf) - sizeof(*globals->push) - sizeof(struct alfred_data) - sizeof(*globals->gpsd_data); @@ -450,7 +450,7 @@ static int gpsd_server(struct globals *globals) int max_fd, ret; const size_t overhead = sizeof(*globals->push) + sizeof(struct alfred_data); - const size_t tpv_size = sizeof(*globals->buf) - + const size_t tpv_size = sizeof(globals->buf) - sizeof(*globals->push) - sizeof(struct alfred_data) - sizeof(*globals->gpsd_data); -- 2.0.0

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: increase default hop penalty
by Simon Wunderlich 24 Jun '14

24 Jun '14

From: Simon Wunderlich <simon(a)open-mesh.com> The default hop penalty is currently set to 15, which is applied like that for multi interface devices (e.g. dual band APs). Single band devices will still use an effective penalty of 30 (hop penalty + wifi penalty). After receiving reports of too long paths in mesh networks with dual band APs which were fixed by increasing the hop penalty, we'd like to suggest to increase that default value in the default setting as well. We've evaluated that increase in a handful of medium sized mesh networks (5-20 nodes) with single and dual band devices, with changes for the better (shorter routes, higher throughput) or no change at all. This patch changes the hop penalty to 30, which will give an effective penalty of 60 on single band devices (hop penalty + wifi penalty). Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index e783afb..9bf382d 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -757,7 +757,7 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->gw.bandwidth_down, 100); atomic_set(&bat_priv->gw.bandwidth_up, 20); atomic_set(&bat_priv->orig_interval, 1000); - atomic_set(&bat_priv->hop_penalty, 15); + atomic_set(&bat_priv->hop_penalty, 30); #ifdef CONFIG_BATMAN_ADV_DEBUG atomic_set(&bat_priv->log_level, 0); #endif -- 1.9.1

6 7

[B.A.T.M.A.N.] [PATCHv3] batman-adv: drop QinQ claim frames in bridge loop avoidance
by Simon Wunderlich 24 Jun '14

24 Jun '14

From: Simon Wunderlich <simon(a)open-mesh.com> Since bridge loop avoidance only supports untagged or simple 802.1q tagged VLAN claim frames, claim frames with stacked VLAN headers (QinQ) should be detected and dropped. Transporting the over the mesh may cause problems on the receivers, or create bogus entries in the local tt tables. Reported-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- Changes to PATCHv2 (thanks Marek): * move check into bla_process_claim() to avoid code duplication Changes to PATCHv1 (thanks Antonio): * add short description, fix capitalization for return * move drop debug message to batadv_bla_process_claim() --- bridge_loop_avoidance.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 6f0d9ec..a957c81 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -800,11 +800,6 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, bla_dst = (struct batadv_bla_claim_dst *)hw_dst; bla_dst_own = &bat_priv->bla.claim_dest; - /* check if it is a claim packet in general */ - if (memcmp(bla_dst->magic, bla_dst_own->magic, - sizeof(bla_dst->magic)) != 0) - return 0; - /* if announcement packet, use the source, * otherwise assume it is in the hw_src */ @@ -866,12 +861,13 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, struct batadv_hard_iface *primary_if, struct sk_buff *skb) { - struct batadv_bla_claim_dst *bla_dst; + struct batadv_bla_claim_dst *bla_dst, *bla_dst_own; uint8_t *hw_src, *hw_dst; - struct vlan_ethhdr *vhdr; + struct vlan_hdr *vhdr, vhdr_buf; struct ethhdr *ethhdr; struct arphdr *arphdr; unsigned short vid; + int vlan_depth = 0; __be16 proto; int headlen; int ret; @@ -882,9 +878,24 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, proto = ethhdr->h_proto; headlen = ETH_HLEN; if (vid & BATADV_VLAN_HAS_TAG) { - vhdr = vlan_eth_hdr(skb); - proto = vhdr->h_vlan_encapsulated_proto; - headlen += VLAN_HLEN; + /* Traverse the VLAN/Ethertypes. + * + * At this point it is known that the first protocol is a VLAN + * header, so start checking at the encapsulated protocol. + * + * The depth of the VLAN headers is recorded to drop BLA claim + * frames encapsulated into multiple VLAN headers (QinQ). + */ + do { + vhdr = skb_header_pointer(skb, headlen, VLAN_HLEN, + &vhdr_buf); + if (!vhdr) + return 0; + + proto = vhdr->h_vlan_encapsulated_proto; + headlen += VLAN_HLEN; + vlan_depth++; + } while (proto == htons(ETH_P_8021Q)); } if (proto != htons(ETH_P_ARP)) @@ -914,6 +925,19 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, hw_src = (uint8_t *)arphdr + sizeof(struct arphdr); hw_dst = hw_src + ETH_ALEN + 4; bla_dst = (struct batadv_bla_claim_dst *)hw_dst; + bla_dst_own = &bat_priv->bla.claim_dest; + + /* check if it is a claim frame in general */ + if (memcmp(bla_dst->magic, bla_dst_own->magic, + sizeof(bla_dst->magic)) != 0) + return 0; + + /* check if there is a claim frame encapsulated deeper in (QinQ) and + * drop that, as this is not supported by BLA but should also not be + * sent via the mesh. + */ + if (vlan_depth > 1) + return 1; /* check if it is a claim frame. */ ret = batadv_check_claim_group(bat_priv, primary_if, hw_src, hw_dst, -- 1.9.1

2 1

[B.A.T.M.A.N.] student
by Akbar Majidi 24 Jun '14

24 Jun '14

Hi Sorry for interested when you are busy. i don’t want patch b.a.t.m.a.n for ns-2 please send patch file for me. i waiting… best regards: Akbar Majidi

1 0

[B.A.T.M.A.N.] Bad link via ethernet using two tl-wr1043nd ports
by Ilario Gelmetti 22 Jun '14

22 Jun '14

Hi all! I'm using OpenWrt trunk (r41296) with batman-adv (2014.2.0) on a TP-Link WR1043ND using this network configuration file: http://sprunge.us/SVCI as you can see batman is running on ports number 1 (eth0.3) and number 3 (eth0.4). root@OpenWrt:~# batctl if eth0.3: active eth0.4: active I connect this router via ethernet cable to another device running batman-adv (2014.2.0). Looking at the link quality with "batctl o" I noticed that sometimes the link quality is poor using a port and good using the other one port. The good and the bad port aren't fixed, they switch randomly, so I tend to exclude an hardware problem. I connected the batman device to port 1 (eth0.3) and laptop on port 3 (eth0.4) and the quality of the batman link changes from one boot to another: root@OpenWrt:~# batctl o [B.A.T.M.A.N. adv 2014.2.0, MainIF/MAC: eth0.3/10:fe:ed:7f:3e:80 (bat0 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... dc:9f:db:2c:e4:34 0.700s (255) dc:9f:db:2d:e4:34 [ eth0.3]: dc:9f:db:2d:e4:34 (255) dc:9f:db:2d:e4:34 0.360s (255) dc:9f:db:2d:e4:34 [ eth0.3]: dc:9f:db:2d:e4:34 (255) -----reboot & wait some minutes----- good, 255 -----reboot & wait some minutes----- root@OpenWrt:~# batctl o [B.A.T.M.A.N. adv 2014.2.0, MainIF/MAC: eth0.4/10:fe:ed:7f:3e:80 (bat0 BATMAN_IV)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... dc:9f:db:2c:e4:34 0.680s (119) dc:9f:db:2d:e4:34 [ eth0.3]: dc:9f:db:2d:e4:34 (119) dc:9f:db:2d:e4:34 0.580s (119) dc:9f:db:2d:e4:34 [ eth0.3]: dc:9f:db:2d:e4:34 (119) -----reboot & wait some minutes----- good, 255 -----reboot & wait some minutes----- bad, ~129 -----reboot & wait some minutes----- bad, ~139 -----reboot & wait some minutes----- bad, ~131 -----reboot & wait some minutes----- good, 255 Thanks, Ilario -- Ilario Gelmetti iochesonome(a)gmail.com ilario.gelmetti(a)sns.it

1 0

[B.A.T.M.A.N.] [PATCHv2] batman-adv: drop QinQ claim frames in bridge loop avoidance
by Simon Wunderlich 22 Jun '14

22 Jun '14

From: Simon Wunderlich <simon(a)open-mesh.com> Since bridge loop avoidance only supports untagged or simple 802.1q tagged VLAN claim frames, claim frames with stacked VLAN headers (QinQ) should be detected and dropped. Transporting the over the mesh may cause problems on the receivers, or create bogus entries in the local tt tables. Reported-by: Antonio Quartulli <antonio(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- Changes to PATCHv1 (thanks Antonio): * add short description, fix capitalization for return * move drop debug message to batadv_bla_process_claim() --- bridge_loop_avoidance.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 6f0d9ec..9e7a5ab 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -851,6 +851,73 @@ static int batadv_check_claim_group(struct batadv_priv *bat_priv, return 2; } +/** + * batadv_is_encapsulated_claim - checks if a claim frame is encapsulated + * @bat_priv: the bat priv with all the soft interface information + * @skb: skb to be checked + * + * Check if this frame is a claim frame encapsulated in at least two layers + * of VLANs. + * + * Returns 1 if this is an encapsulated claim frame, 0 otherwise. + */ +static int batadv_is_encapsulated_claim(struct batadv_priv *bat_priv, + struct sk_buff *skb) +{ + struct batadv_bla_claim_dst *bla_dst, *bla_dst_own; + struct vlan_hdr vhdr, *vhdr_ptr; + uint8_t *hw_src, *hw_dst; + struct ethhdr *ethhdr; + struct arphdr *arphdr; + int headlen; + + /* Traverse the VLAN/Ethertypes until an ARP header is found. + * + * At this point it is known that the first two protocols + * are VLAN headers, so start checking at the encapsulated protocol + * of the second header. + */ + headlen = VLAN_ETH_HLEN; + do { + vhdr_ptr = skb_header_pointer(skb, headlen, VLAN_HLEN, &vhdr); + if (!vhdr_ptr) + return 0; + + headlen += VLAN_HLEN; + } while (vhdr_ptr->h_vlan_encapsulated_proto == htons(ETH_P_8021Q)); + + if (vhdr_ptr->h_vlan_encapsulated_proto != htons(ETH_P_ARP)) + return 0; + + if (unlikely(!pskb_may_pull(skb, headlen + arp_hdr_len(skb->dev)))) + return 0; + + /* pskb_may_pull() may have modified the pointers, get ethhdr again */ + ethhdr = eth_hdr(skb); + arphdr = (struct arphdr *)((uint8_t *)ethhdr + headlen); + + /* Check whether the ARP frame carries a valid IP information */ + if (arphdr->ar_hrd != htons(ARPHRD_ETHER)) + return 0; + if (arphdr->ar_pro != htons(ETH_P_IP)) + return 0; + if (arphdr->ar_hln != ETH_ALEN) + return 0; + if (arphdr->ar_pln != 4) + return 0; + + hw_src = (uint8_t *)arphdr + sizeof(struct arphdr); + hw_dst = hw_src + ETH_ALEN + 4; + bla_dst = (struct batadv_bla_claim_dst *)hw_dst; + bla_dst_own = &bat_priv->bla.claim_dest; + + /* check if it is a claim frame in general */ + if (memcmp(bla_dst->magic, bla_dst_own->magic, + sizeof(bla_dst->magic)) != 0) + return 0; + + return 1; +} /** * batadv_bla_process_claim @@ -885,6 +952,24 @@ static int batadv_bla_process_claim(struct batadv_priv *bat_priv, vhdr = vlan_eth_hdr(skb); proto = vhdr->h_vlan_encapsulated_proto; headlen += VLAN_HLEN; + + if (proto == htons(ETH_P_8021Q)) { + /* check if there is a claim frame encapsulated + * deeper in (QinQ) and drop that, as this is + * not supported by BLA but should also not be + * sent via the mesh. + * + * if its not, let the frame pass without further + * checks, as it is not a claim frame anyway. + */ + if (batadv_is_encapsulated_claim(bat_priv, skb)) { + batadv_dbg(BATADV_DBG_BLA, bat_priv, + "Dropping encapsulated claim frame\n"); + return 1; + } else { + return 0; + } + } } if (proto != htons(ETH_P_ARP)) -- 1.9.1

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Add multicast optimization support for bridged setups
by Linus Lüssing 21 Jun '14

21 Jun '14

So far, the recently added multicast optimizations did not support a configuration where a bridge is on top of the soft-interface (e.g. bat0). Now the Linux bridge code is able to provide us with the missing bits: Multicast Listeners: The bridge hands us a list of multicast listeners it has detected behind the bridge which we will announce through the mesh via the translation table, allowing other nodes to direct multicast packets to these clients behind the bridge even with enabled multicast optimizations. Queriers: The bridge informs us whether there is a selected IGMP or MLD querier behind the bridge. In that case we need to all according IPv4 or IPv6 multicast traffic directed to us. These two parts together allow us to serve all multicast listeners with IPv6 link-local multicast packets even when bridges are involved and our multicast optimizations enabled. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- compat.c | 15 ++++++ compat.h | 30 ++++++++++++ main.h | 1 + multicast.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 179 insertions(+), 18 deletions(-) diff --git a/compat.c b/compat.c index 3dbf9d2..7187a34 100644 --- a/compat.c +++ b/compat.c @@ -109,3 +109,18 @@ void batadv_free_rcu_tvlv_handler(struct rcu_head *rcu) } #endif /* < KERNEL_VERSION(3, 0, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + +int br_multicast_list_adjacent(struct net_device *dev, + struct list_head *br_ip_list) +{ + return 0; +} + +bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto) +{ + return true; +} + +#endif /* < KERNEL_VERSION(3, 16, 0) */ diff --git a/compat.h b/compat.h index 5eb5fe6..24a86cd 100644 --- a/compat.h +++ b/compat.h @@ -240,6 +240,12 @@ static inline void skb_reset_mac_len(struct sk_buff *skb) #endif /* < KERNEL_VERSION(3, 0, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) + +#define IS_ENABLED(x) defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) + +#endif /* < KERNEL_VERSION(3, 1, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #define batadv_interface_add_vid(x, y, z) \ @@ -438,4 +444,28 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 14, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + +int br_multicast_list_adjacent(struct net_device *dev, + struct list_head *br_ip_list); +bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto); + +struct br_ip { + union { + __be32 ip4; +#if IS_ENABLED(CONFIG_IPV6) + struct in6_addr ip6; +#endif + } u; + __be16 proto; + __u16 vid; +}; + +struct br_ip_list { + struct list_head list; + struct br_ip addr; +}; + +#endif /* < KERNEL_VERSION(3, 16, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/main.h b/main.h index 87e7196..d34dc5d 100644 --- a/main.h +++ b/main.h @@ -169,6 +169,7 @@ enum batadv_uev_type { #include <linux/netdevice.h> /* netdevice */ #include <linux/etherdevice.h> /* ethernet address classification */ #include <linux/if_ether.h> /* ethernet header */ +#include <linux/if_bridge.h> /* bridge / multicast-snooping communication */ #include <linux/poll.h> /* poll_table */ #include <linux/kthread.h> /* kernel threads */ #include <linux/pkt_sched.h> /* schedule types */ diff --git a/multicast.c b/multicast.c index 96b66fd..e4a8acd 100644 --- a/multicast.c +++ b/multicast.c @@ -23,6 +23,29 @@ #include "multicast.h" /** + * batadv_mcast_get_bridge - get the bridge on top of the softif if it exists + * @soft_iface: netdev struct of the mesh interface + * + * Returns either a bridge interface on top of our soft interface or + * NULL if no such bridge exists. + */ +static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface) +{ + struct net_device *upper = soft_iface; + + rcu_read_lock(); + do { + upper = netdev_master_upper_dev_get_rcu(upper); + } while (upper && !(upper->priv_flags & IFF_EBRIDGE)); + + if (upper) + dev_hold(upper); + rcu_read_unlock(); + + return upper; +} + +/** * batadv_mcast_mla_softif_get - get softif multicast listeners * @dev: the device to collect multicast addresses from * @mcast_list: a list to put found addresses into @@ -30,17 +53,21 @@ * Collect multicast addresses of the local multicast listeners * on the given soft interface, dev, in the given mcast_list. * + * If there is a bridge interface on top of dev, collect from that one + * instead. + * * Returns -ENOMEM on memory allocation error or the number of * items added to the mcast_list otherwise. */ static int batadv_mcast_mla_softif_get(struct net_device *dev, struct hlist_head *mcast_list) { + struct net_device *bridge = batadv_mcast_get_bridge(dev); struct netdev_hw_addr *mc_list_entry; struct batadv_hw_addr *new; int ret = 0; - netif_addr_lock_bh(dev); + netif_addr_lock_bh(bridge ? bridge : dev); netdev_for_each_mc_addr(mc_list_entry, dev) { new = kmalloc(sizeof(*new), GFP_ATOMIC); if (!new) { @@ -52,7 +79,10 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev, hlist_add_head(&new->list, mcast_list); ret++; } - netif_addr_unlock_bh(dev); + netif_addr_unlock_bh(bridge ? bridge : dev); + + if (bridge) + dev_put(bridge); return ret; } @@ -78,6 +108,87 @@ static bool batadv_mcast_mla_is_duplicate(uint8_t *mcast_addr, } /** + * batadv_mcast_mla_br_addr_cpy - copy a bridge multicast address + * @dst: destination to write to - a multicast MAC address + * @src: source to read from - a multicast IP address + * + * Converts a given multicast IPv4/IPv6 address from a bridge + * to its matching multicast MAC address and copies it into the given + * destination buffer. + * + * Caller needs to make sure the destination buffer can hold + * at least ETH_ALEN bytes. + */ +static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src) +{ + if (src->proto == htons(ETH_P_IP)) { + /* RFC 1112 */ + memcpy(dst, "\x01\x00\x5e", 3); + memcpy(dst + 3, ((char *)&src->u.ip4) + 1, ETH_ALEN - 3); + dst[3] &= 0x7F; + } +#if IS_ENABLED(CONFIG_IPV6) + else if (src->proto == htons(ETH_P_IPV6)) { + /* RFC 2464 */ + memcpy(dst, "\x33\x33", 2); + memcpy(dst + 2, &src->u.ip6.s6_addr32[3], + sizeof(src->u.ip6.s6_addr32[3])); + } +#endif + else + memset(dst, 0, ETH_ALEN); +} + +/** + * batadv_mcast_mla_bridge_get - get bridged-in multicast listeners + * @dev: a bridge slave whose bridge to collect multicast addresses from + * @mcast_list: a list to put found addresses into + * + * Collects multicast addresses of the bridged-in multicast listeners + * from the bridge on top of the given soft interface, dev, in the + * given mcast_list. + * + * Returns -ENOMEM on memory allocation error or the number of + * items added to the mcast_list otherwise. + */ +static int batadv_mcast_mla_bridge_get(struct net_device *dev, + struct hlist_head *mcast_list) +{ + struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list); + struct br_ip_list *br_ip_entry, *tmp; + struct batadv_hw_addr *new; + uint8_t mcast_addr[ETH_ALEN]; + int ret; + + ret = br_multicast_list_adjacent(dev, &bridge_mcast_list); + if (ret < 0) + goto out; + + list_for_each_entry(br_ip_entry, &bridge_mcast_list, list) { + batadv_mcast_mla_br_addr_cpy(mcast_addr, &br_ip_entry->addr); + if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list)) + continue; + + new = kmalloc(sizeof(*new), GFP_ATOMIC); + if (!new) { + ret = -ENOMEM; + break; + } + + ether_addr_copy(new->addr, mcast_addr); + hlist_add_head(&new->list, mcast_list); + } + +out: + list_for_each_entry_safe(br_ip_entry, tmp, &bridge_mcast_list, list) { + list_del(&br_ip_entry->list); + kfree(br_ip_entry); + } + + return ret; +} + +/** * batadv_mcast_mla_list_free - free a list of multicast addresses * @mcast_list: the list to free * @@ -185,8 +296,8 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv) * Updates the own multicast tvlv with our current multicast related settings, * capabilities and inabilities. * - * Returns true if the tvlv container is registered afterwards. Otherwise - * returns false. + * Returns false if we want all IPv4 && IPv6 multicast traffic and true + * otherwise. */ static bool batadv_mcast_mla_tvlv_update(struct batadv_priv *bat_priv) { @@ -195,19 +306,18 @@ static bool batadv_mcast_mla_tvlv_update(struct batadv_priv *bat_priv) mcast_data.flags = BATADV_NO_FLAGS; memset(mcast_data.reserved, 0, sizeof(mcast_data.reserved)); - /* Avoid attaching MLAs, if there is a bridge on top of our soft - * interface, we don't support that yet (TODO) - */ - if (batadv_mcast_has_bridge(bat_priv)) { - if (bat_priv->mcast.enabled) { - batadv_tvlv_container_unregister(bat_priv, - BATADV_TVLV_MCAST, 1); - bat_priv->mcast.enabled = false; - } + if (!batadv_mcast_has_bridge(bat_priv)) + goto skip; - return false; - } + mcast_data.flags |= BATADV_MCAST_WANT_ALL_UNSNOOPABLES; + + if (br_multicast_has_querier_adjacent(bat_priv->soft_iface, ETH_P_IP)) + mcast_data.flags |= BATADV_MCAST_WANT_ALL_IPV4; + if (br_multicast_has_querier_adjacent(bat_priv->soft_iface, ETH_P_IPV6)) + mcast_data.flags |= BATADV_MCAST_WANT_ALL_IPV6; + +skip: if (!bat_priv->mcast.enabled || mcast_data.flags != bat_priv->mcast.flags) { batadv_tvlv_container_register(bat_priv, BATADV_TVLV_MCAST, 1, @@ -216,7 +326,8 @@ static bool batadv_mcast_mla_tvlv_update(struct batadv_priv *bat_priv) bat_priv->mcast.enabled = true; } - return true; + return !(mcast_data.flags & + (BATADV_MCAST_WANT_ALL_IPV4 + BATADV_MCAST_WANT_ALL_IPV6)); } /** @@ -233,13 +344,17 @@ void batadv_mcast_mla_update(struct batadv_priv *bat_priv) int ret; if (!batadv_mcast_mla_tvlv_update(bat_priv)) - goto update; + goto skip; ret = batadv_mcast_mla_softif_get(soft_iface, &mcast_list); if (ret < 0) goto out; -update: + ret = batadv_mcast_mla_bridge_get(soft_iface, &mcast_list); + if (ret < 0) + goto out; + +skip: batadv_mcast_mla_tt_retract(bat_priv, &mcast_list); batadv_mcast_mla_tt_add(bat_priv, &mcast_list); -- 1.7.10.4

3 6

[B.A.T.M.A.N.] Bridge changing source mac address prevents batman-adv from connecting
by Ilario Gelmetti 20 Jun '14

20 Jun '14

Hi all! I'm using batman-adv (2014.2.0) on two devices running OpenWrt (LibreMesh) connected using a third device running a proprietary firmware in bridge mode (AirOS), this is the topology: http://i.imgur.com/ELMi5RC.png mac3E80 OpenWrt batman----cable----macE3E7 AirOS station----wireless-- --macE434 AP OpenWrt batman using tcpdump on the OpenWrt devices I can see batman packets flowing: on mac3E80 I can see: http://sprunge.us/iePM while on macE434 I can see: http://sprunge.us/DIAX as you can see the problem is that macE434 sees packets from mac3E80 *approaching with the wrong mac address*, the mac address of macE3E7 so I think it discards the packages when source mac address is different from mac address specified inside the packet. Is this only a security check? How could I get things work? Thanks, Ilario -- Ilario Gelmetti iochesonome(a)gmail.com ilario.gelmetti(a)sns.it

3 2

[B.A.T.M.A.N.] New to the list
by Jay Brussels 17 Jun '14

17 Jun '14

Hello everyone, Just joined the list. I have completed a 2,000 client WiFi network without using mesh networking. I am planning on building a mesh network for 7,000 clients utilizing 145 gateways. I have the radio backbone already in place for another purpose (145 stations connected to centrally located tower) and this is fed by fiber. I am interested in mesh networking since some clients (indoor dual-band routers) will not be able to communicate directly with the 145 radios. I plan to add a second radio at each of the 145 sites to be part of the mesh network. Any help or suggestions will be appreciated. Jay Brussels DSLX jay(a)dslx.net

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 June 2014