B.A.T.M.A.N October 2012

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

24 participants
68 discussions

[B.A.T.M.A.N.] [PATCH 1/2] batman-adv: Fix regression in bla multiline comment style
by Sven Eckelmann 18 Oct '12

18 Oct '12

4c1721b39c8a77c99e8f4de97b5d5d112006406c ("batman-adv: Fix potential broadcast BLA-duplicate-check race condition") introduced a comment with the wrong line ending. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Please merge in next bridge_loop_avoidance.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index c6c1c59..776a73d 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1302,7 +1302,8 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, goto out; } /* not found, add a new entry (overwrite the oldest entry) - * and allow it, its the first occurence. */ + * and allow it, its the first occurence. + */ curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1); curr %= BATADV_DUPLIST_SIZE; entry = &bat_priv->bla.bcast_duplist[curr]; -- 1.7.10.4

2 3

[B.A.T.M.A.N.] [PATCH] batman-adv: Recommend not to change Makefile for configuration
by Sven Eckelmann 18 Oct '12

18 Oct '12

The Makefile suggests to change it to enable or disable features. This resulted in patch submissions with changed Makefile even when this change would not be necessary. Instead the configuration should be done using the make parameters explained in README.external Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c6266a2..4d70e40 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # 02110-1301, USA # -# changing the CONFIG_* line to 'y' enables the related feature +# read README.external for more information about the configuration # B.A.T.M.A.N. debugging: export CONFIG_BATMAN_ADV_DEBUG=n # B.A.T.M.A.N. bridge loop avoidance: -- 1.7.10.4

2 1

[B.A.T.M.A.N.] Web-based Visualisation Tool of Choice for batman-adv?
by Steve Song 17 Oct '12

17 Oct '12

Hi all, Is there an obvious choice for web-based visualisation of batman-adv networks? We currently use a custom product (SPUD - http://dev.villagetelco.org/trac/browser/spud/trunk/INSTALL) built specifically for Village Telco but would prefer to join our efforts to a broader community-based effort. I am aware of Nodewatcher http://nodewatcher.readthedocs.org/en/latest/installation.html and Nodeshot http://wiki.ninux.org/InstallNodeshot but both of these take a little adapting to batman-adv. Is there anything out there that has been developed specifically for batman-adv? Thanks... Steve -- Steve Song http://villagetelco.org http://manypossibilities.net

3 3

[B.A.T.M.A.N.] [PATCH 1/4] alfred: Prepare makefile for distibutions
by Sven Eckelmann 17 Oct '12

17 Oct '12

Distributions must be able to easily set CPPFLAGS, CFLAGS and LDFLAGS to have full control about optimization or security related flags. It is also necessary to be able to install all files. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 92299ac..9796528 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,81 @@ -LDFLAGS=-ggdb -static -CFLAGS=-O2 -Wall -ggdb -BIN=alfred -OBJS=main.o server.o client.o netsock.o send.o recv.o hash.o unix_sock.o util.o -default: all -all: $(BIN) -$(BIN): $(OBJS) - gcc $(LDFLAGS) $(OBJS) -o $(BIN) -.c.o: - gcc $(CFLAGS) -o $@ -c $< +#!/usr/bin/make -f +# -*- makefile -*- +# +# Copyright (C) 2012 B.A.T.M.A.N. contributors +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 of the GNU General Public +# License as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA +# + +# alfred build +BINARY_NAME = alfred +OBJ = main.o server.o client.o netsock.o send.o recv.o hash.o unix_sock.o util.o + +# alfred flags and options +CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD +LDLIBS += + +# disable verbose output +ifneq ($(findstring $(MAKEFLAGS),s),s) +ifndef V + Q_CC = @echo ' ' CC $@; + Q_LD = @echo ' ' LD $@; + export Q_CC + export Q_LD +endif +endif + +# standard build tools +CC ?= gcc +RM ?= rm -f +INSTALL ?= install +MKDIR ?= mkdir -p +COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c +LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH) + +# standard install paths +PREFIX = /usr/local +SBINDIR = $(PREFIX)/sbin + +# try to generate revision +REVISION= $(shell if [ -d .git ]; then \ + echo $$(git describe --always --dirty --match "v*" |sed 's/^v//' 2> /dev/null || echo "[unknown]"); \ + fi) +ifneq ($(REVISION),) +CPPFLAGS += -DSOURCE_VERSION=\"$(REVISION)\" +endif + +# default target +all: $(BINARY_NAME) + +# standard build rules +.SUFFIXES: .o .c +.c.o: + $(COMPILE.c) -o $@ $< + +$(BINARY_NAME): $(OBJ) + $(LINK.o) $^ $(LDLIBS) -o $@ + clean: - rm -f $(BIN) $(OBJS) + $(RM) $(BINARY_NAME) $(OBJ) $(DEP) + +install: $(BINARY_NAME) + $(MKDIR) $(DESTDIR)$(SBINDIR) + $(INSTALL) -m 0755 $(BINARY_NAME) $(DESTDIR)$(SBINDIR) + +# load dependencies +DEP = $(OBJ:.o=.d) +-include $(DEP) + +.PHONY: all clean install -- 1.7.10.4

2 7

[B.A.T.M.A.N.] [PATCH] alfred: Provide default SOURCE_VERSION for tarball distribution
by Sven Eckelmann 17 Oct '12

17 Oct '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- alfred.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/alfred.h b/alfred.h index 795a78a..bfc7649 100644 --- a/alfred.h +++ b/alfred.h @@ -25,6 +25,10 @@ #include "hash.h" #define __packed __attribute__ ((packed)) +#ifndef SOURCE_VERSION +#define SOURCE_VERSION "2013.0.0" +#endif + struct alfred_data { uint8_t source[ETH_ALEN]; uint8_t type; -- 1.7.10.4

1 0

[B.A.T.M.A.N.] [RFC] batman-adv: Add function to calculate crc32c for the skb payload
by Sven Eckelmann 17 Oct '12

17 Oct '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- main.c | 34 ++++++++++++++++++++++++++++++++++ main.h | 1 + 2 files changed, 35 insertions(+) diff --git a/main.c b/main.c index 70797de..122c675 100644 --- a/main.c +++ b/main.c @@ -33,6 +33,7 @@ #include "vis.h" #include "hash.h" #include "bat_algo.h" +#include <linux/crc32c.h> /* List manipulations on hardif_list have to be rtnl_lock()'ed, @@ -432,6 +433,39 @@ int batadv_compat_seq_print_text(struct seq_file *seq, void *offset) return 0; } +/** + * batadv_crc32 - calculate CRC32 of the whole packet and skip bytes in header + * @skb: skb pointing to fragmented socket buffers + * @payload_ptr: Pointer to position inside the head buffer of the skb + * marking the start of the data to be CRC'ed + * + * payload_ptr must always point to the point in the skb head buffer and not to + * a fragment. + */ +__be32 batadv_crc32(const struct sk_buff *skb, u8 *payload_ptr) +{ + u32 crc = 0; + struct sk_buff *iter; + size_t skip_len, read_len; + const skb_frag_t *f; + int i; + + skip_len = payload_ptr - skb->data; + read_len = skb_headlen(skb) - skip_len; + if (read_len) + crc = crc32c(crc, payload_ptr, read_len); + + for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) { + f = &skb_shinfo(skb)->frags[i]; + crc = crc32c(crc, skb_frag_address(f), skb_frag_size(f)); + } + + skb_walk_frags(skb, iter) + crc = crc32c(crc, iter->data, skb_headlen(iter)); + + return htonl(crc); +} + static int batadv_param_set_ra(const char *val, const struct kernel_param *kp) { struct batadv_algo_ops *bat_algo_ops; diff --git a/main.h b/main.h index 2dfcf8c..bb0a710 100644 --- a/main.h +++ b/main.h @@ -177,6 +177,7 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); int batadv_algo_select(struct batadv_priv *bat_priv, char *name); int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); int batadv_compat_seq_print_text(struct seq_file *seq, void *offset); +__be32 batadv_crc32(const struct sk_buff *skb, u8 *payload_ptr); /** * enum batadv_dbg_level - available log levels -- 1.7.10.4

3 4

[B.A.T.M.A.N.] [PATCH] batctl: Add tool to translate mac/IPv4/bat_host to originator address
by Sven Eckelmann 17 Oct '12

17 Oct '12

Users may want to get the originator which is responsible for a specific mac address. These addresses can be specified using IPv4 address, ethernet address or bat-host name. For example, the output can be used to get the TQ value from the originator table when only the client address is known and not the gateway address. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Makefile | 2 +- README | 18 ++++++++++++++ main.c | 6 +++++ man/batctl.8 | 5 ++++ translate.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ translate.h | 24 ++++++++++++++++++ 6 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 translate.c create mode 100644 translate.h diff --git a/Makefile b/Makefile index 4379837..699a3ea 100755 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ export CONFIG_BATCTL_BISECT=n # batctl build BINARY_NAME = batctl -OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o hash.o vis.o debugfs.o ioctl.o list-batman.o +OBJ = main.o bat-hosts.o functions.o sys.o debug.o ping.o traceroute.o tcpdump.o hash.o vis.o debugfs.o ioctl.o list-batman.o translate.o OBJ_BISECT = bisect_iv.o MANPAGE = man/batctl.8 diff --git a/README b/README index b9c6b23..efdd3cb 100644 --- a/README +++ b/README @@ -75,6 +75,24 @@ $ batctl statistics dat_reply_tx: 1 dat_reply_rx: 0 +batctl translate +================ + +Translates a destination (hostname, IPv4, MAC, bat_host-name) to the originator +mac address responsible for it. + +Usage: batctl translate mac|bat-host|host-name|IPv4-address + +Example: + +$ batctl translate www.google.de +02:ca:fe:af:fe:01 +$ batctl translate 02:ca:fe:af:fe:01 +02:ca:fe:af:fe:01 +$ batctl translate 192.168.1.2 +02:ca:fe:af:fe:05 +$ batctl translate fe:fe:00:00:09:01 +02:ca:fe:af:fe:05 batctl ping ============ diff --git a/main.c b/main.c index 647818d..5d85d8b 100644 --- a/main.c +++ b/main.c @@ -32,6 +32,7 @@ #include "sys.h" #include "debug.h" #include "ping.h" +#include "translate.h" #include "traceroute.h" #include "tcpdump.h" #include "bisect_iv.h" @@ -85,6 +86,7 @@ void print_usage(void) printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); + printf(" \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); #ifdef BATCTL_BISECT printf(" \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); #endif @@ -174,6 +176,10 @@ int main(int argc, char **argv) ret = ioctl_statistics_get(mesh_iface); + } else if ((strcmp(argv[1], "translate") == 0) || (strcmp(argv[1], "t") == 0)) { + + ret = translate(mesh_iface, argc - 1, argv + 1); + #ifdef BATCTL_BISECT } else if ((strcmp(argv[1], "bisect_iv") == 0)) { diff --git a/man/batctl.8 b/man/batctl.8 index feb1a17..3c8edce 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -200,6 +200,11 @@ List of debug tables: .RE .RE .br +.IP "\fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIPv4_address\fP" + +Translates a destination (hostname, IPv4, MAC, bat_host-name) to the originator +mac address responsible for it. +.br .IP "\fBstatistics\fP|\fBs\fP" Retrieve traffic counters from batman-adv kernel module. The output may vary depending on which features have been compiled into the kernel module. diff --git a/translate.c b/translate.c new file mode 100644 index 0000000..2d6ede9 --- /dev/null +++ b/translate.c @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: + * + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + +#include <netinet/in.h> +#include <stdio.h> +#include <stdlib.h> + +#include "main.h" +#include "translate.h" +#include "functions.h" +#include "bat-hosts.h" + + +static void translate_usage(void) +{ + printf("Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); +} + +int translate(char *mesh_iface, int argc, char **argv) +{ + struct ether_addr *dst_mac = NULL; + struct bat_host *bat_host; + int ret = EXIT_FAILURE; + char *dst_string, *mac_string; + + if (argc <= 1) { + fprintf(stderr, "Error - destination not specified\n"); + translate_usage(); + return EXIT_FAILURE; + } + + dst_string = argv[1]; + bat_hosts_init(0); + bat_host = bat_hosts_find_by_name(dst_string); + + if (bat_host) + dst_mac = &bat_host->mac_addr; + + if (!dst_mac) { + dst_mac = resolve_mac(dst_string); + + if (!dst_mac) { + fprintf(stderr, "Error - mac address of the ping destination could not be resolved and is not a bat-host name: %s\n", dst_string); + goto out; + } + } + + dst_mac = translate_mac(mesh_iface, dst_mac); + if (dst_mac) { + mac_string = ether_ntoa_long(dst_mac); + printf("%s\n", mac_string); + ret = EXIT_SUCCESS; + } else { + ret = EXIT_NOSUCCESS; + } + +out: + bat_hosts_free(); + return ret; +} diff --git a/translate.h b/translate.h new file mode 100644 index 0000000..eb0ef65 --- /dev/null +++ b/translate.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: + * + * Marek Lindner <lindner_marek(a)yahoo.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + */ + + + +int translate(char *mesh_iface, int argc, char **argv); -- 1.7.10.4

2 1

[B.A.T.M.A.N.] [PATCHv2 1/2] batman-adv: Fix broadcast packet CRC calculation
by Linus Lüssing 17 Oct '12

17 Oct '12

So far the crc16 checksum for a batman-adv broadcast data packet, received on a batman-adv hard interface, was calculated over zero bytes of its content leading to many incoming broadcast data packets wrongly being dropped. This patch fixes this issue by calculating the crc16 over the actual, complete broadcast payload. The issue is a regression introduced by "batman-adv: add broadcast duplicate check". Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- It led to about 60-80% broadcast packet loss to a direct neighbor with a ping6 with a 1s interval in our scenario, but about no packet loss with an interval smaller than 0.2s. Also see: https://projects.universe-factory.net/issues/65 (German) v2: ~ fixed typo (regrission vs. regression) ~ commit name instead of commit hash in the commit message bridge_loop_avoidance.c | 8 ++++---- routing.c | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index a617f2c..b828875 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1247,8 +1247,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) /** * batadv_bla_check_bcast_duplist * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: originator mac address - * @hdr_size: maximum length of the frame + * @bcast_packet: encapsulated broadcast frame plus batman header + * @bcast_packet_len: length of encapsulated broadcast frame plus batman header * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1261,14 +1261,14 @@ int batadv_bla_init(struct batadv_priv *bat_priv) */ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, - int hdr_size) + int bcast_packet_len) { int i, length, curr; uint8_t *content; uint16_t crc; struct batadv_bcast_duplist_entry *entry; - length = hdr_size - sizeof(*bcast_packet); + length = bcast_packet_len - sizeof(*bcast_packet); content = (uint8_t *)bcast_packet; content += sizeof(*bcast_packet); diff --git a/routing.c b/routing.c index 6b2104d..5da62df 100644 --- a/routing.c +++ b/routing.c @@ -1181,8 +1181,14 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* keep skb linear for crc calculation */ + if (skb_linearize(skb) < 0) + goto out; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) goto out; /* rebroadcast packet */ -- 1.7.10.4

3 5

[B.A.T.M.A.N.] [PATCH] batctl: Print compat version when querying the version
by Sven Eckelmann 16 Oct '12

16 Oct '12

Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- main.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/main.c b/main.c index 01a435b..eaaec0a 100644 --- a/main.c +++ b/main.c @@ -31,6 +31,7 @@ #include "main.h" #include "sys.h" #include "debug.h" +#include "debugfs.h" #include "ping.h" #include "traceroute.h" #include "tcpdump.h" @@ -42,6 +43,7 @@ char mesh_dfl_iface[] = "bat0"; char module_ver_path[] = "/sys/module/batman_adv/version"; +char module_compat_ver_file[] = "batman_adv/compat_version"; void print_usage(void) { @@ -90,6 +92,44 @@ void print_usage(void) #endif } +static void print_version(void) +{ + int ret; + char *debugfs_mnt; + + printf("batctl %s [", SOURCE_VERSION); + + ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0); + if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (ret == EXIT_SUCCESS) { + printf("batman-adv: %s", line_ptr); + } else { + printf("module not loaded"); + goto out; + } + + free(line_ptr); + line_ptr = NULL; + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) + goto out; + + ret = read_file(debugfs_mnt, module_compat_ver_file, USE_READ_BUFF | SILENCE_ERRORS, 0, 0); + if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (ret == EXIT_SUCCESS) + printf(", compat: %s", line_ptr); + +out: + free(line_ptr); + line_ptr = NULL; + printf("]\n"); +} + int main(int argc, char **argv) { int i, ret = EXIT_FAILURE; @@ -116,18 +156,7 @@ int main(int argc, char **argv) goto err; if (strcmp(argv[1], "-v") == 0) { - printf("batctl %s [batman-adv: ", SOURCE_VERSION); - - ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0); - if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) - line_ptr[strlen(line_ptr) - 1] = '\0'; - - if (ret == EXIT_SUCCESS) - printf("%s]\n", line_ptr); - else - printf("module not loaded]\n"); - - free(line_ptr); + print_version(); exit(EXIT_SUCCESS); } -- 1.7.10.4

2 2

[B.A.T.M.A.N.] [PATCHv4 1/4] batctl: Translate client mac to originator mac for ping/traceroute
by Sven Eckelmann 16 Oct '12

16 Oct '12

A user may want to check the path selected by batman-adv for any client when only the MAC of the device with the IPv4 is known, but not the originator address. batctl can assist the user by parsing the global translation table to automatically translate it for him. The ping itself will only be done until the originator is reached and not until the actual client could be contacted because the client cannot understand batman-adv ping packets. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- rebased on DAT README | 1 + debug.h | 1 + functions.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ functions.h | 1 + man/batctl.8 | 10 ++++--- ping.c | 11 +++++++- traceroute.c | 11 +++++++- 7 files changed, 111 insertions(+), 6 deletions(-) diff --git a/README b/README index 22ad616..04a6e66 100644 --- a/README +++ b/README @@ -87,6 +87,7 @@ parameters: -h print this help -i interval in seconds -t timeout in seconds + -T don't try to translate mac to originator address -R record route Example: diff --git a/debug.h b/debug.h index 4e935cb..5bd7f3e 100644 --- a/debug.h +++ b/debug.h @@ -22,6 +22,7 @@ #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" #define DEBUG_VIS_DATA "vis_data" +#define DEBUG_TRANSTABLE_GLOBAL "transtable_global" #define DEBUG_LOG "log" enum batctl_debug_tables { diff --git a/functions.c b/functions.c index 1cde235..7875716 100644 --- a/functions.c +++ b/functions.c @@ -37,6 +37,7 @@ #include "bat-hosts.h" #include "sys.h" #include "debug.h" +#include "debugfs.h" static struct timeval start_time; static char *host_name; @@ -320,3 +321,84 @@ out: close(fd); return res; } + +struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac) +{ + enum { + tg_start, + tg_mac, + tg_via, + tg_originator, + } pos; + char full_path[MAX_PATH+1]; + char *debugfs_mnt; + static struct ether_addr in_mac; + struct ether_addr *mac_result, *mac_tmp; + FILE *f = NULL; + size_t len = 0; + char *line = NULL; + char *input, *saveptr, *token; + int line_invalid; + + memcpy(&in_mac, mac, sizeof(in_mac)); + mac_result = &in_mac; + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) + goto out; + + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/" DEBUG_TRANSTABLE_GLOBAL, mesh_iface, full_path, sizeof(full_path)); + + f = fopen(full_path, "r"); + if (!f) + goto out; + + while (getline(&line, &len, f) != -1) { + line_invalid = 0; + pos = tg_start; + input = line; + + while ((token = strtok_r(input, " \t", &saveptr))) { + input = NULL; + + switch (pos) { + case tg_start: + if (strcmp(token, "*") != 0) + line_invalid = 1; + else + pos = tg_mac; + break; + case tg_mac: + mac_tmp = ether_aton(token); + if (!mac_tmp || memcmp(mac_tmp, &in_mac, + sizeof(in_mac)) != 0) + line_invalid = 1; + else + pos = tg_via; + break; + case tg_via: + if (strcmp(token, "via") == 0) + pos = tg_originator; + break; + case tg_originator: + mac_tmp = ether_aton(token); + if (!mac_tmp) { + line_invalid = 1; + } else { + mac_result = mac_tmp; + goto out; + } + break; + } + + if (line_invalid) + break; + } + } + +out: + if (f) + fclose(f); + free(line); + return mac_result; +} diff --git a/functions.h b/functions.h index 92d6ae5..a59bb24 100644 --- a/functions.h +++ b/functions.h @@ -37,6 +37,7 @@ int file_exists(const char *fpath); int read_file(char *dir, char *path, int read_opt, float orig_timeout, float watch_interval); int write_file(char *dir, char *fname, char *arg1, char *arg2); +struct ether_addr *translate_mac(char *mesh_iface, struct ether_addr *mac); extern char *line_ptr; diff --git a/man/batctl.8 b/man/batctl.8 index fdc788e..369be20 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -212,17 +212,19 @@ tt - translation table counters All counters without a prefix concern payload (pure user data) traffic. .RE .br -.IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +.IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" Layer 2 ping of a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was not a MAC address. The "\-c" option tells batctl how man pings should be sent before the program exits. Without the "\-c" option batctl will continue pinging without end. Use CTRL + C to stop it. With "\-i" and "\-t" you can set the default interval between pings and the timeout time for replies, both in seconds. When run with "\-R", the route taken by the ping -messages will be recorded. +messages will be recorded. With "\-T" you can disable the automatic translation of a client MAC address to the originator +address which is responsible for this client. .br -.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" +.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP" Layer 2 traceroute to a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was not a MAC address. batctl will send 3 packets to each host and display the response time. If "\-n" is given batctl will -not replace the MAC addresses with bat\-host names in the output. +not replace the MAC addresses with bat\-host names in the output. With "\-T" you can disable the automatic translation of a +client MAC address to the originator address which is responsible for this client. .br .IP "\fBtcpdump\fP|\fBtd\fP [\fB\-c\fP][\fB\-n\fP][\fB\-p filter\fP][\fB\-x filter\fP] \fBinterface ...\fP" batctl will display all packets that are seen on the given interface(s). A variety of options to filter the output diff --git a/ping.c b/ping.c index ce8f457..02132f4 100644 --- a/ping.c +++ b/ping.c @@ -51,6 +51,7 @@ void ping_usage(void) printf(" \t -i interval in seconds\n"); printf(" \t -t timeout in seconds\n"); printf(" \t -R record route\n"); + printf(" \t -T don't try to translate mac to originator address\n"); } void sig_handler(int sig) @@ -83,8 +84,9 @@ int ping(char *mesh_iface, int argc, char **argv) size_t packet_len; char *debugfs_mnt; char icmp_socket[MAX_PATH+1]; + int disable_translate_mac = 0; - while ((optchar = getopt(argc, argv, "hc:i:t:R")) != -1) { + while ((optchar = getopt(argc, argv, "hc:i:t:RT")) != -1) { switch (optchar) { case 'c': loop_count = strtol(optarg, NULL , 10); @@ -111,6 +113,10 @@ int ping(char *mesh_iface, int argc, char **argv) rr = 1; found_args++; break; + case 'T': + disable_translate_mac = 1; + found_args += 1; + break; default: ping_usage(); return EXIT_FAILURE; @@ -139,6 +145,9 @@ int ping(char *mesh_iface, int argc, char **argv) } } + if (!disable_translate_mac) + dst_mac = translate_mac(mesh_iface, dst_mac); + mac_string = ether_ntoa_long(dst_mac); signal(SIGINT, sig_handler); signal(SIGTERM, sig_handler); diff --git a/traceroute.c b/traceroute.c index 75ff2b3..4e42419 100644 --- a/traceroute.c +++ b/traceroute.c @@ -47,6 +47,7 @@ void traceroute_usage(void) printf("parameters:\n"); printf(" \t -h print this help\n"); printf(" \t -n don't convert addresses to bat-host names\n"); + printf(" \t -T don't try to translate mac to originator address\n"); } int traceroute(char *mesh_iface, int argc, char **argv) @@ -63,8 +64,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) double time_delta[NUM_PACKETS]; char *debugfs_mnt; char icmp_socket[MAX_PATH+1]; + int disable_translate_mac = 0; - while ((optchar = getopt(argc, argv, "hn")) != -1) { + while ((optchar = getopt(argc, argv, "hnT")) != -1) { switch (optchar) { case 'h': traceroute_usage(); @@ -73,6 +75,10 @@ int traceroute(char *mesh_iface, int argc, char **argv) read_opt &= ~USE_BAT_HOSTS; found_args += 1; break; + case 'T': + disable_translate_mac = 1; + found_args += 1; + break; default: traceroute_usage(); return EXIT_FAILURE; @@ -101,6 +107,9 @@ int traceroute(char *mesh_iface, int argc, char **argv) } } + if (!disable_translate_mac) + dst_mac = translate_mac(mesh_iface, dst_mac); + mac_string = ether_ntoa_long(dst_mac); debugfs_mnt = debugfs_mount(NULL); -- 1.7.10.4

2 6

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 2012