B.A.T.M.A.N August 2014

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

13 participants
43 discussions

[B.A.T.M.A.N.] Possible regression? Adhoc Mode broken & kernel oops with batman-adv.
by Bruno Antunes 29 Aug '14

29 Aug '14

Using OpenWrt trunk r42000 on 2 different boards (gw2388-4 & router station pro) causes kernel oops when restarting the network or wifi. The setting that causes the oops is connecting in adhoc mode to a batman-adv mesh network. As comparison WDS mode works fine for the same boards. Also Adhoc mode using wpa_supplicant appears to be broken. With wpa2 security only allows connections at 54 Mbps, removing security allows for 802.11n rates. Don't know if the 2 issues are related or not. Below the kernel oops from the router station. Regards, Bruno root@RSPro1:/# wifi root@RSPro1:/# [ 182.040000] batman_adv: bat0: Interface deactivated: adhoc0 [ 182.050000] batman_adv: bat0: Removing interface: adhoc0 [ 182.080000] br-mesh: port 2(bat0) entered disabled state [ 182.080000] device bat0 left promiscuous mode [ 182.090000] br-mesh: port 2(bat0) entered disabled state [ 182.100000] CPU 0 Unable to handle kernel paging request at virtual address 00000020, epc == 87090884, ra == 870963e8 [ 182.110000] Oops[#1]: [ 182.110000] CPU: 0 PID: 6 Comm: kworker/u2:0 Not tainted 3.10.49 #2 [ 182.110000] Workqueue: bat_events batadv_softif_vlan_get [batman_adv] [ 182.110000] task: 878294f0 ti: 87844000 task.ti: 87844000 [ 182.110000] $ 0 : 00000000 00000001 00000020 00000000 [ 182.110000] $ 4 : 00000000 00008004 80321e28 803825a2 [ 182.110000] $ 8 : 00180041 00180041 00000001 873d7080 [ 182.110000] $12 : 00000020 00000001 00170041 00000000 [ 182.110000] $16 : 00000000 86913200 00000000 8690b100 [ 182.110000] $20 : 000001b0 00000000 00200200 ffffd1f2 [ 182.110000] $24 : 00000000 00000000 [ 182.110000] $28 : 87844000 87845da0 802eb3b0 870963e8 [ 182.110000] Hi : 00000009 [ 182.110000] Lo : 00009c40 [ 182.110000] epc : 87090884 batadv_softif_vlan_free_ref+0x14/0xe0 [batman_adv] [ 182.110000] Not tainted [ 182.110000] ra : 870963e8 batadv_tt_free+0xc0/0x2e4 [batman_adv] [ 182.110000] Status: 1000fc03 KERNEL EXL IE [ 182.110000] Cause : 00800008 [ 182.110000] BadVA : 00000020 [ 182.110000] PrId : 00019374 (MIPS 24Kc) [ 182.110000] Modules linked in: ath9k ath9k_htc ath9k_common pppoe ppp_async iptable_nat ath9k_hw ath pppox ppp_generic pl2303 nf_nat_ipv4 nf_conntrack_ipvh [ 182.110000] Process kworker/u2:0 (pid: 6, threadinfo=87844000, task=878294f0, tls=00000000) [ 182.110000] Stack : 00000000 8692ebc0 8692e800 87845e30 8692ebc0 870963e8 ffffd1f2 ffffd1f2 8692ebc0 8692ebc0 8692ebc0 8692e800 87845e30 80310000 80310f20 00000000 ffffd1f2 8708a374 ffffd1f2 87084fd4 87845e30 00000001 80310f20 8692e800 8692e800 8708fa24 00000000 87845e0c 00000000 8692ea08 8692ea08 801b2b74 878294f0 8027c780 00000000 8692e800 87845e30 87845e30 87813900 8692ecb8 ... [ 182.110000] Call Trace: [ 182.110000] [<87090884>] batadv_softif_vlan_free_ref+0x14/0xe0 [batman_adv] [ 182.110000] [<870963e8>] batadv_tt_free+0xc0/0x2e4 [batman_adv] [ 182.110000] [<8708a374>] batadv_mesh_free+0x54/0x88 [batman_adv] [ 182.110000] [<8708fa24>] batadv_purge_outstanding_packets+0x2fc/0x8d8 [batman_adv] [ 182.110000] [ 182.110000] Code: afb00010 afbf0014 00808021 <c0430000> 2464ffff e0440000 1080fffc 00000000 24020001 [ 182.360000] ---[ end trace 19fd45c8593c0fb4 ]--- [ 182.370000] Kernel panic - not syncing: Fatal exception in interrupt [ 182.370000] Rebooting in 3 seconds..+

1 0

[B.A.T.M.A.N.] How to test the non-mesh client roaming feature?
by liu 27 Aug '14

27 Aug '14

Hello, everyone. I want to test the non-mesh client roaming feature. And I have connected my notebook to the mesh node A via the access point on node A. What should I do next? When the notebook move to the mesh node B, should I connect it to the access point on node B manually?How to make the non-mesh client move to another mesh node automatically? Thanks. Best regards liu

3 2

[B.A.T.M.A.N.] [PATCH] alfred: support for changing interfaces
by Simon Wunderlich 25 Aug '14

25 Aug '14

From: Simon Wunderlich <simon(a)open-mesh.com> This patch adds support for changing the interface alfreds listens to on the fly without restarting alfred. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- alfred.h | 2 ++ client.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ main.c | 66 +++++++++++++++++++++++++++++++++++------------------------- man/alfred.8 | 3 +++ packet.h | 17 ++++++++++++++++ unix_sock.c | 38 ++++++++++++++++++++++++++++++++++ vis/vis.c | 2 +- 7 files changed, 154 insertions(+), 28 deletions(-) diff --git a/alfred.h b/alfred.h index 35ac4dd..f0989ea 100644 --- a/alfred.h +++ b/alfred.h @@ -86,6 +86,7 @@ enum clientmode { CLIENT_REQUEST_DATA, CLIENT_SET_DATA, CLIENT_MODESWITCH, + CLIENT_CHANGE_INTERFACE, }; struct globals { @@ -125,6 +126,7 @@ int set_best_server(struct globals *globals); int alfred_client_request_data(struct globals *globals); int alfred_client_set_data(struct globals *globals); int alfred_client_modeswitch(struct globals *globals); +int alfred_client_change_interface(struct globals *globals); /* recv.c */ int recv_alfred_packet(struct globals *globals); struct transaction_head * diff --git a/client.c b/client.c index b868719..48313db 100644 --- a/client.c +++ b/client.c @@ -22,6 +22,7 @@ #include <ctype.h> #include <errno.h> #include <netinet/in.h> +#include <sys/ioctl.h> #include <stdint.h> #include <stdio.h> #include <string.h> @@ -218,3 +219,56 @@ int alfred_client_modeswitch(struct globals *globals) unix_sock_close(globals); return 0; } + +int alfred_client_change_interface(struct globals *globals) +{ + unsigned char buf[MAX_PAYLOAD]; + struct alfred_change_interface_v0 *change_interface; + struct ifreq ifr; + int ret, len; + int sock = -1; + + if (unix_sock_open_client(globals)) + return -1; + + if (strlen(globals->interface) > IFNAMSIZ) { + fprintf(stderr, "%s: interface name too long, not changing\n", + __func__); + return 0; + } + + sock = socket(PF_INET6, SOCK_DGRAM, 0); + if (sock < 0) { + perror("can't open socket"); + return -1; + } + + strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + ifr.ifr_name[IFNAMSIZ - 1] = '\0'; + if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { + fprintf(stderr, "%s: can't find interface, not changing\n", + __func__); + close(sock); + return -1; + } + + close(sock); + + change_interface = (struct alfred_change_interface_v0 *)buf; + len = sizeof(*change_interface); + + change_interface->header.type = ALFRED_CHANGE_INTERFACE; + change_interface->header.version = ALFRED_VERSION; + change_interface->header.length = htons(len - sizeof(change_interface->header)); + memcpy(change_interface->iface, globals->interface, + sizeof(change_interface->iface)); + + ret = write(globals->unix_sock, buf, len); + if (ret != len) + fprintf(stderr, "%s: only wrote %d of %d bytes: %s\n", + __func__, ret, len, strerror(errno)); + + unix_sock_close(globals); + + return 0; +} diff --git a/main.c b/main.c index 1add44e..5a4f1e6 100644 --- a/main.c +++ b/main.c @@ -33,25 +33,29 @@ static void alfred_usage(void) { printf("Usage: alfred [options]\n"); printf("client mode options:\n"); - printf(" -s, --set-data [data type] sets new data to distribute from stdin\n"); - printf(" for the supplied data type (0-255)\n"); - printf(" -r, --request [data type] collect data from the network and prints\n"); - printf(" it on the network\n"); - printf(" -V, --req-version specify the data version set for -s\n"); - printf(" -M, --modeswitch master switch daemon to mode master\n"); - printf(" slave switch daemon to mode slave\n"); + printf(" -s, --set-data [data type] sets new data to distribute from stdin\n"); + printf(" for the supplied data type (0-255)\n"); + printf(" -r, --request [data type] collect data from the network and prints\n"); + printf(" it on the network\n"); + printf(" -V, --req-version specify the data version set for -s\n"); + printf(" -M, --modeswitch master switch daemon to mode master\n"); + printf(" slave switch daemon to mode slave\n"); + printf(" -I, --change-interface [interface] change to the specified interface\n"); printf("\n"); printf("server mode options:\n"); - printf(" -i, --interface specify the interface to listen on\n"); - printf(" -b specify the batman-adv interface configured on the system (default: bat0)\n"); - printf(" use 'none' to disable the batman-adv based best server selection\n"); - printf(" -m, --master start up the daemon in master mode, which\n"); - printf(" accepts data from slaves and synces it with\n"); - printf(" other masters\n"); + printf(" -i, --interface specify the interface to listen on\n"); + printf(" -b specify the batman-adv interface\n"); + printf(" configured on the system (default: bat0)\n"); + printf(" use 'none' to disable the batman-adv\n"); + printf(" based best server selection\n"); + printf(" -m, --master start up the daemon in master mode, which\n"); + printf(" accepts data from slaves and synces it with\n"); + printf(" other masters\n"); printf("\n"); - printf(" -u, --unix-path [path] path to unix socket used for client-server communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); - printf(" -v, --version print the version\n"); - printf(" -h, --help this help\n"); + printf(" -u, --unix-path [path] path to unix socket used for client-server\n"); + printf(" communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); + printf(" -v, --version print the version\n"); + printf(" -h, --help this help\n"); printf("\n"); } @@ -60,16 +64,17 @@ static struct globals *alfred_init(int argc, char *argv[]) int opt, opt_ind, i; struct globals *globals; struct option long_options[] = { - {"set-data", required_argument, NULL, 's'}, - {"request", required_argument, NULL, 'r'}, - {"interface", required_argument, NULL, 'i'}, - {"master", no_argument, NULL, 'm'}, - {"help", no_argument, NULL, 'h'}, - {"req-version", required_argument, NULL, 'V'}, - {"modeswitch", required_argument, NULL, 'M'}, - {"unix-path", required_argument, NULL, 'u'}, - {"version", no_argument, NULL, 'v'}, - {NULL, 0, NULL, 0}, + {"set-data", required_argument, NULL, 's'}, + {"request", required_argument, NULL, 'r'}, + {"interface", required_argument, NULL, 'i'}, + {"master", no_argument, NULL, 'm'}, + {"help", no_argument, NULL, 'h'}, + {"req-version", required_argument, NULL, 'V'}, + {"modeswitch", required_argument, NULL, 'M'}, + {"change-interface", required_argument, NULL, 'I'}, + {"unix-path", required_argument, NULL, 'u'}, + {"version", no_argument, NULL, 'v'}, + {NULL, 0, NULL, 0}, }; globals = &alfred_globals; @@ -85,7 +90,7 @@ static struct globals *alfred_init(int argc, char *argv[]) time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:u:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -135,6 +140,10 @@ static struct globals *alfred_init(int argc, char *argv[]) } globals->clientmode = CLIENT_MODESWITCH; break; + case 'I': + globals->clientmode = CLIENT_CHANGE_INTERFACE; + globals->interface = strdup(optarg); + break; case 'u': globals->unix_path = optarg; break; @@ -176,6 +185,9 @@ int main(int argc, char *argv[]) case CLIENT_MODESWITCH: return alfred_client_modeswitch(globals); break; + case CLIENT_CHANGE_INTERFACE: + return alfred_client_change_interface(globals); + break; } return 0; diff --git a/man/alfred.8 b/man/alfred.8 index c90caa8..35dee45 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -80,6 +80,9 @@ to 0 ('\fB\-V\fP 0'). \fBslave\fP Switch daemon to mode slave .fi +.TP +\fB\-I\fP, \fB\-\-change\-interface\fP \fIinterface\fP +Change the alfred server to use the new \fBinterface\fP . .SH SERVER OPTIONS .TP diff --git a/packet.h b/packet.h index ba8c5f6..dc06d65 100644 --- a/packet.h +++ b/packet.h @@ -20,6 +20,8 @@ #ifndef _ALFRED_PACKET_H #define _ALFRED_PACKET_H +#include <net/if.h> /* IFNAMSIZ */ + #define __packed __attribute__ ((packed)) /* basic blocks */ @@ -67,6 +69,7 @@ struct alfred_transaction_mgmt { * @ALFRED_STATUS_TXEND: Transaction was finished by sender * @ALFRED_STATUS_ERROR: Error was detected during the transaction * @ALFRED_MODESWITCH: Switch between different operation modes + * @ALFRED_CHANGE_INTERFACE: Change the listening interface */ enum alfred_packet_type { ALFRED_PUSH_DATA = 0, @@ -75,6 +78,7 @@ enum alfred_packet_type { ALFRED_STATUS_TXEND = 3, ALFRED_STATUS_ERROR = 4, ALFRED_MODESWITCH = 5, + ALFRED_CHANGE_INTERFACE = 6, }; /* packets */ @@ -143,6 +147,19 @@ struct alfred_modeswitch_v0 { } __packed; /** + * struct alfred_change_interface_v0 - Request to change the interface + * @header: TLV header describing the complete packet + * @iface: interface name to be changed to + * + * Sent to the daemon by client + */ +struct alfred_change_interface_v0 { + struct alfred_tlv header; + char iface[IFNAMSIZ]; +} __packed; + + +/** * struct alfred_status_v0 - Status info of a transaction * @header: TLV header describing the complete packet * @tx: Transaction identificator and sequence number of packet diff --git a/unix_sock.c b/unix_sock.c index cc0d25c..516c0a5 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -298,6 +298,38 @@ err: return ret; } +static int +unix_sock_change_iface(struct globals *globals, + struct alfred_change_interface_v0 *change_iface, + int client_sock) +{ + int len, ret = -1; + char *iface; + + len = ntohs(change_iface->header.length); + + if (len < (int)(sizeof(*change_iface) - sizeof(change_iface->header))) + goto err; + + iface = malloc(IFNAMSIZ + 1); + if (!iface) + goto err; + + memcpy(iface, change_iface->iface, IFNAMSIZ); + iface[IFNAMSIZ] = 0; + + netsock_close(globals->netsock); + + free(globals->interface); + globals->interface = iface; + netsock_open(globals); + + ret = 0; +err: + close(client_sock); + return ret; +} + int unix_sock_read(struct globals *globals) { int client_sock; @@ -350,6 +382,12 @@ int unix_sock_read(struct globals *globals) (struct alfred_modeswitch_v0 *)packet, client_sock); break; + case ALFRED_CHANGE_INTERFACE: + ret = unix_sock_change_iface(globals, + (struct alfred_change_interface_v0 *)packet, + client_sock); + break; + default: /* unknown packet type */ ret = -1; diff --git a/vis/vis.c b/vis/vis.c index 00372ab..3dd5c8c 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -23,7 +23,7 @@ #include <dirent.h> #include <errno.h> #include <getopt.h> -#include <linux/if.h> +#include <net/if.h> #include <netinet/in.h> #include <signal.h> #include <stdbool.h> -- 2.1.0

1 0

[B.A.T.M.A.N.] [PATCHv3] batctl: tcpdump - parse TVLV containers
by Antonio Quartulli 20 Aug '14

20 Aug '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> --- 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 | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- tcpdump.h | 1 + 5 files changed, 177 insertions(+), 5 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..59b46d6 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -62,8 +62,7 @@ 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_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 +82,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 +99,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 +614,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 +631,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 +838,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

1 0

[B.A.T.M.A.N.] [PATCHv2 1/2] batctl: adding multicast debug level
by Linus Lüssing 17 Aug '14

17 Aug '14

This patch adds the multicast debug level to check for own multicast flag changes for instance. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- Changes in v2: * added a sentence about 'mcast' log level to manpage README | 1 + man/batctl.8 | 6 +++--- sys.c | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README b/README index b5fd259..c5e3575 100644 --- a/README +++ b/README @@ -389,6 +389,7 @@ $ batctl loglevel [ ] messages related to bridge loop avoidance (bla) [ ] messages related to arp snooping and distributed arp table (dat) [ ] messages related to network coding (nc) +[ ] messages related to multicast (mcast) batctl nc_nodes =============== diff --git a/man/batctl.8 b/man/batctl.8 index 110020e..66c28bb 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -98,9 +98,9 @@ level. Level 'none' disables all verbose logging. Level 'batman' enables message Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'dat' enables messages related to ARP snooping and the Distributed Arp Table. Level 'nc' enables messages related to network coding. -Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. -Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options -won't be available. +Level 'mcast' enables messages related to multicast optimizations. Level 'all' enables all messages. The messages +are sent to the batman-adv debug log. Use \fBbatctl log\fP to retrieve it. Make sure to have debugging output enabled +when compiling the module otherwise the output as well as the loglevel options won't be available. .br .IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not diff --git a/sys.c b/sys.c index 676bef1..4fa0e24 100644 --- a/sys.c +++ b/sys.c @@ -280,6 +280,7 @@ static void log_level_usage(void) fprintf(stderr, " \t bla Messages related to bridge loop avoidance\n"); fprintf(stderr, " \t dat Messages related to arp snooping and distributed arp table\n"); fprintf(stderr, " \t nc Messages related to network coding\n"); + fprintf(stderr, " \t mcast Messages related to multicast\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -325,6 +326,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= BIT(4); else if (strcmp(argv[i], "nc") == 0) log_level |= BIT(5); + else if (strcmp(argv[i], "mcast") == 0) + log_level |= BIT(6); else { log_level_usage(); goto out; @@ -359,6 +362,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to arp snooping and distributed arp table", "dat"); printf("[%c] %s (%s)\n", (log_level & BIT(5)) ? 'x' : ' ', "messages related to network coding", "nc"); + printf("[%c] %s (%s)\n", (log_level & BIT(6)) ? 'x' : ' ', + "messages related to multicast", "mcast"); out: free(path_buff); -- 1.7.10.4

2 2

[B.A.T.M.A.N.] how to compile the latest version of batctl in OpenWrt 12.09
by liu 15 Aug '14

15 Aug '14

Hello, I try to test the latest version of batman-adv in OpenWrt 12.09. I failed to compile 'batctl' because of the old version of 'libnl' in OpenWrt.The version '2014.3' and the development version of 'batctl' require 'libnl-3.0', but OpenWrt 12.09 only contain the 'libnl-2.0.1'. That's the problem. How to fix this? Anyone have built it in OpenWrt 12.09 yet? Thanks. Best regards liu

2 3

[B.A.T.M.A.N.] Testing example of interface bonding
by Ray Gibson 13 Aug '14

13 Aug '14

Hello, Are there any documented cases (aside from the aging graph on the wiki) on batman-adv bonding setups? I'm testing batman-adv 2014.3.0 in an effort to experiment and test with multi-link optimizations. There is no wifi in the picture at the moment, this is being done with tap interfaces right now. My two nodes have this network config: lan0: bridge of eth0 and bat0, 192.168.100.1 on node1, 192.168.100.2 on node2 bat0: includes tap0 and tap1 active, no IP. eth1: "wan" link, 10.10.10.1 on node1, 10.10.10.2 on node2 tap0/1: openvpn bridge links over eth1, no IPs assigned to these interfaces. This is a VMware environment for testing. With the above setup, I can ping/iperf/whatever back and forth on the 192.168.100.x network. It works great just extending a lan transparently on a wan link. This was the original idea, with redundant connections (hence the multi tap interfaces). Now, I'm trying to isolate the test down to bonding. However, enabling bonding in batctl on both nodes has no apparent effect whatsoever. Watching an iperf session in ifstat, I will see constant traffic on bat0, and then either tap0 or tap1 depending on how it's feeling at the time. Sometimes it will shift all the traffic to the other tap interface. Sometimes the incoming traffic will be on one interface and the outgoing traffic will be on the other. Note: I'm running iperf/etc on the nodes themselves, not on separate devices on the lan bridge. Ultimately I am looking to try bonding several 3G or 4G devices together with batman-adv to achieve higher throughput to a single destination. Thank you for any comments or suggestions. I find batman-adv very useful in other projects and look to extend its use into this one. Ray

2 3

[B.A.T.M.A.N.] [RFC] batman-adv: experimental sysfs variable to always apply half duplex penalty
by Simon Wunderlich 13 Aug '14

13 Aug '14

The half duplex interface penalty is currently only applied for wifi interfaces. While this is intended, the bonding feature relies on different next hop routers to be chosen for different interface tables, which does not necessarily happen for Ethernet or virtual machine networks when all links considered equally perfect and are not penalized. This patch adds an option to always apply the half duplex interface penalty, regardless of whether its an wifi interface or not. Then, the Ethernet interfaces are also penalized and the bonding has enough candidates to choose from. I'm not yet sure if its a good idea to add that option, and it should probably go into debugfs anyway, but adding it in sysfs for now was the easiest option. :) In any way, I'd like to hear about your opinion and/or test results! Thanks, Simon Reported-by: Ray Gibson <booray(a)gmail.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> --- bat_iv_ogm.c | 3 ++- sysfs.c | 3 +++ types.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 73209f3..46ac297 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1227,7 +1227,8 @@ static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, */ tq_iface_penalty = BATADV_TQ_MAX_VALUE; if (if_outgoing && (if_incoming == if_outgoing) && - batadv_is_wifi_netdev(if_outgoing->net_dev)) + (batadv_is_wifi_netdev(if_outgoing->net_dev) || + atomic_read(&bat_priv->always_half_duplex_penalty))) tq_iface_penalty = batadv_hop_penalty(BATADV_TQ_MAX_VALUE, bat_priv); diff --git a/sysfs.c b/sysfs.c index fc47baa..3fca470 100644 --- a/sysfs.c +++ b/sysfs.c @@ -545,6 +545,8 @@ BATADV_ATTR_SIF_UINT(orig_interval, S_IRUGO | S_IWUSR, 2 * BATADV_JITTER, INT_MAX, NULL); BATADV_ATTR_SIF_UINT(hop_penalty, S_IRUGO | S_IWUSR, 0, BATADV_TQ_MAX_VALUE, NULL); +BATADV_ATTR_SIF_BOOL(always_half_duplex_penalty, S_IRUGO | S_IWUSR, NULL); + BATADV_ATTR_SIF_UINT(gw_sel_class, S_IRUGO | S_IWUSR, 1, BATADV_TQ_MAX_VALUE, batadv_post_gw_reselect); static BATADV_ATTR(gw_bandwidth, S_IRUGO | S_IWUSR, batadv_show_gw_bwidth, @@ -579,6 +581,7 @@ static struct batadv_attribute *batadv_mesh_attrs[] = { &batadv_attr_gw_mode, &batadv_attr_orig_interval, &batadv_attr_hop_penalty, + &batadv_attr_always_half_duplex_penalty, &batadv_attr_gw_sel_class, &batadv_attr_gw_bandwidth, #ifdef CONFIG_BATMAN_ADV_DEBUG diff --git a/types.h b/types.h index 462a70c..cb75fac 100644 --- a/types.h +++ b/types.h @@ -727,6 +727,7 @@ struct batadv_softif_vlan { * @gw_sel_class: gateway selection class (applies if gw_mode client) * @orig_interval: OGM broadcast interval in milliseconds * @hop_penalty: penalty which will be applied to an OGM's tq-field on every hop + * @always_half_duplex_penalty: whether to always apply half duplex penalty * @log_level: configured log level (see batadv_dbg_level) * @bcast_seqno: last sent broadcast packet sequence number * @bcast_queue_left: number of remaining buffered broadcast packet slots @@ -780,6 +781,7 @@ struct batadv_priv { atomic_t gw_sel_class; atomic_t orig_interval; atomic_t hop_penalty; + atomic_t always_half_duplex_penalty; #ifdef CONFIG_BATMAN_ADV_DEBUG atomic_t log_level; #endif -- 2.1.0.rc1

1 0

[B.A.T.M.A.N.] [PATCHv7 0/3] Multicast optimizations for bridges
by Linus Lüssing 11 Aug '14

11 Aug '14

This patchset enables the usage of the batman-adv multicast optimizations for scenarios involving bridges on top of e.g. bat0, too. Along come two more patches adding according debugging facilities to make it possible for the user to check why the multicast optimizations might not work ideally to give hints about what they might change about their topology. Cheers, Linus Changes in v7 (thanks to Simon's suggestions): - PATCH 2/3: * renaming old/new_querier to old/new_state * slightly extended kerneldoc of batadv_mcast_querier_log() * removing words "good" and "bad" from debug output * simplified batadv_mcast_flags_log() * assignment instead of memset in batadv_mcast_mla_tvlv_update() and batadv_softif_init_late() * simple struct member assignments instead of one complex struct assigment * removing unnecessary memcmp's * substituting return statement for an if-block in batadv_mcast_querier_log() and batadv_mcast_bridge_log() * print "Unsnoopables(U)-flag" instead of just "U-flag" - PATCH 3/3: * use bat_priv values instead of querying bridge ABI in batadv_mcast_flags_print_header() Changes in v6: * New PATCH 2/3 inserted, moving logging to separate patch * More verbose logging added to PATCH 2/3: Bridge and querier state changes are logged too * upper case to lower case for kernel doc of batadv_mcast_flags_open (PATCH 2/3) * Adding note to kernel doc of batadv_mcast_get_bridge about increased refcount (PATCH 1/3) * Printing some lines about current bridge and querier state to debugfs too (PATCH 3/3) Changes in v5 (PATCH 2/2 only): * s/dat_cache/mcast_flags/ in kerneldoc (copy&paste error) Changes in v4 (PATCH 2/2 only): * initial {ad,e}dition of this patch Changes in v3 (PATCH 1/2 only): * Removed "RFC" tag in title again: The stubs and new export are upstream in net-next and therefore going to be included in 3.17 * Added some debug output: * Two warning messages: -> Old kernel version or no bridge IGMP/MLD snooping compiled * New batman-adv log-level "mcast": -> Logging mcast flag changes (a third debugging facility, a new table for debugfs for a global mcast flag overview will be added in a separate patch later as discussed with Simon) Changes in v2 (PATCH 1/2 only): * fetching local (= on this same kernel) multicast listeners from the bridge instead of the bat0 interface if a bridge is present - just like ip addresses and routes should be used from br0, the same goes for multicast listeners * beautification of batadv_mcast_mla_br_addr_cpy(), now using already present functions from the kernel instead of own, hackish approach * changed names of some goto-labels (not using "skip" anymore) * using new, third bridge multicast export (because this export is not upstream yet, I've added the "RFC" in the title): br_multicast_has_querier_anywhere() * adding compat stubs for two bridge multicast exports, to make batman-adv compile- and usable even if a 3.16 kernel was compiled without bridge code - the stubs are supposed to be upstream in the bridge code in 3.17 (therefore just 'compat') * updated kerneldocs for batadv_mcast_mla_bridge_get() and batadv_mcast_mla_softif_get() * The two sentences in the commit message starting with "Queriers: ..." were slightly modified to include the third bridge multicast export

2 4

[B.A.T.M.A.N.] [PATCHv2 01/13] batman-adv: kernel doc fixes for bat_iv_ogm.c
by Martin Hundebøll 11 Aug '14

11 Aug '14

Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> --- bat_iv_ogm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 1e80539..73209f3 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -28,7 +28,7 @@ /** - * batadv_dup_status - duplicate status + * enum batadv_dup_status - duplicate status * @BATADV_NO_DUP: the packet is a duplicate * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the * neighbor) @@ -517,7 +517,7 @@ out: * @bat_priv: the bat priv with all the soft interface information * @packet_len: (total) length of the OGM * @send_time: timestamp (jiffies) when the packet is to be sent - * @direktlink: true if this is a direct link packet + * @directlink: true if this is a direct link packet * @if_incoming: interface where the packet was received * @if_outgoing: interface for which the retransmission should be considered * @forw_packet: the forwarded packet which should be checked @@ -1366,6 +1366,7 @@ out: /** * batadv_iv_ogm_process_per_outif - process a batman iv OGM for an outgoing if * @skb: the skb containing the OGM + * @ogm_offset: offset from skb->data to start of ogm header * @orig_node: the (cached) orig node for the originator of this OGM * @if_incoming: the interface where this packet was received * @if_outgoing: the interface for which the packet should be considered @@ -1902,10 +1903,10 @@ out: * batadv_iv_ogm_neigh_is_eob - check if neigh1 is equally good or better than * neigh2 from the metric prospective * @neigh1: the first neighbor object of the comparison - * @if_outgoing: outgoing interface for the first neighbor + * @if_outgoing1: outgoing interface for the first neighbor * @neigh2: the second neighbor object of the comparison * @if_outgoing2: outgoing interface for the second neighbor - + * * Returns true if the metric via neigh1 is equally good or better than * the metric via neigh2, false otherwise. */ -- 2.0.1

3 20

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N August 2014