B.A.T.M.A.N July 2010

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

18 participants
28 discussions

[B.A.T.M.A.N.] batctl: timeout + refresh-interval, v3
by Linus Lüssing 06 Jul '10

06 Jul '10

Now functions.d being removed again; adding manpage-entries. Two smaller info-output changes (x.y instead of xxx.xxx; "-%c" in a printf instead of just "%c" when entering an unknown command). Cheers, Linus

2 4

[B.A.T.M.A.N.] Reviewing batman-adv for net/
by Sven Eckelmann 06 Jul '10

06 Jul '10

Hi, batman-adv is a meshing protocol currently in drivers/staging/batman-adv. We asked GregKH recently [1] if he thinks that it is ok to send a patch to you for review. He acknowledged that request and now we would like to ask you to review it. I will send a patch referencing this mail. I hope you find time to send us your opinion and ideas. thanks, Sven [1] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2010-June/002881.html [2] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2010-June/002968.html

4 6

[B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (4)
by Sven Eckelmann 06 Jul '10

06 Jul '10

Hi, here are patches targeted for 2.6.36. There are some patches which must be applied before them. All were send in the following order as reply to 1277504905-27672-1-git-send-email-sven.eckelmann(a)gmx.de and 201006260236.10217.sven.eckelmann(a)gmx.de Staging: batman-adv: Convert names from Java to C style Staging: batman-adv: Avoid rounding issues for local hna timeout Staging: batman-adv: Lower resolution for timeouts Staging: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability Staging: batman-adv: Add sysfs abi documentation about bonding Staging: batman-adv: adapting source version to revised versioning scheme Staging: batman-adv: Add include guards to all header files Staging: batman-adv: fix early debugfs deinitialization Staging: batman-adv: Allow to build it inside the kernel Staging: batman-adv: Remove dependency to PROCFS thanks, Sven Linus Lüssing (1): Staging: batman-adv: Add last-seen in originator table Marek Lindner (1): Staging: batman-adv: add routing debug log accessible via debugfs Sven Eckelmann (1): Staging: batman-adv: Move printk to simplified macros drivers/staging/batman-adv/aggregation.c | 5 +- drivers/staging/batman-adv/bat_debugfs.c | 197 +++++++++++++++++++++++- drivers/staging/batman-adv/bat_sysfs.c | 131 +++++++++++----- drivers/staging/batman-adv/bitarray.c | 7 +- drivers/staging/batman-adv/hard-interface.c | 53 +++---- drivers/staging/batman-adv/icmp_socket.c | 13 +- drivers/staging/batman-adv/main.c | 26 +--- drivers/staging/batman-adv/main.h | 56 +++++-- drivers/staging/batman-adv/originator.c | 54 ++++--- drivers/staging/batman-adv/routing.c | 74 ++++++---- drivers/staging/batman-adv/send.c | 35 +++-- drivers/staging/batman-adv/translation-table.c | 27 ++-- drivers/staging/batman-adv/types.h | 12 ++- drivers/staging/batman-adv/vis.c | 9 +- 14 files changed, 506 insertions(+), 193 deletions(-)

1 3

[B.A.T.M.A.N.] batman adv unicast fragmentation (version 3)
by Andreas Langer 06 Jul '10

06 Jul '10

Hi, thanks for the reply of the patch and all the hints. I changed some parts as you suggested and here some notes to your questions. >> + if (!(my_skb_push(frag_skb, hdr_len) >= 0 && >> + my_skb_push(skb, hdr_len) >= 0)) { >Didn't you wanted to check if one of the my_skb_push failed and not if both >failed? This part check if one failed, but you are right if you think that it looks too complicated. I changed it because it is easy to misunderstand this expression. >Can you please explain why the copyright already starts in 2007? Copy and paste failure, changed it to 2010. >> + if (atomic_read(&batman_if->frag_seqno) == FRAG_MAX_SEQ) >> + atomic_set(&batman_if->frag_seqno, 0); >It is not a good idea to split two atomic_ operations which depends on each other. I removed that part completely, because there is a simplier way. And now some words to the implementation. This version of fragmentation handles only packets over a batX interface. My test setup follows: laptop tap0 --> br0 (bat0/eth0) host1 eth1 ------> eth0 host2 -----> eth0 host3 ping -s 1472 -M do xxx 1472 bytes - data 28 bytes - icmp / ip 14 bytes - eth Bat0 receives 1514 bytes (interface_tx, data_len), if data_len + unicast_packet is larger than the mtu of the sending interface, this packet will be fragmented. In fragmentation 2.0 i would like to implement a solution for the problem described by simon ( i hope i understood him correctly). A node has two batman interfaces and the mtu of interface2 is smaller then interface1. In case a packet from iface1 (with the size of this mtu) travels to iface2, we currently have a problem. Version 2.0 will fix this. regards, andreas

2 4

[B.A.T.M.A.N.] batman adv unicast fragmentation
by Andreas Langer 05 Jul '10

05 Jul '10

Hi, things that changed since the last patch: - with fragmentation enabled the mtu of batX is always ETH_DATA_LEN - fragment if mtu of the outgoing interface is smaller the needed size - add a new packet type for fragmentation - new recv function for fragmented packets - new route unicast packet function to share routing code - increase compat number to 12 regards, andreas

3 7

[B.A.T.M.A.N.] [PATCH] batman-adv: Add last-seen in originator table
by Linus Lüssing 01 Jul '10

01 Jul '10

From: mesh-node <mesh-node(a)mesh-node1.(none)> Right now, there is no easy/intuitive way to find out whether a node might have vanished. This commit adds the time when a node was last seen to the originator table output, so that a common user is able to tell whether a node might have gone without having to wait PURGE_TIMEOUT seconds until that node gets "garbe-collected". Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- originator.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/originator.c b/originator.c index c28c4f5..5343ab2 100644 --- a/originator.c +++ b/originator.c @@ -296,6 +296,8 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) struct orig_node *orig_node; struct neigh_node *neigh_node; int batman_count = 0; + int last_seen_secs; + int last_seen_msecs; unsigned long flags; char orig_str[ETH_STR_LEN], router_str[ETH_STR_LEN]; @@ -312,12 +314,13 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) } rcu_read_lock(); - seq_printf(seq, " %-14s (%s/%i) %17s [%10s]: %20s " - "... [B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)]\n", - "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF", - "Potential nexthops", SOURCE_VERSION, REVISION_VERSION_STR, + seq_printf(seq, "[B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)]\n", + SOURCE_VERSION, REVISION_VERSION_STR, bat_priv->primary_if->dev, bat_priv->primary_if->addr_str, net_dev->name); + seq_printf(seq, " %-15s %s (%s/%i) %17s [%10s]: %20s ...\n", + "Originator", "last-seen", "#", TQ_MAX_VALUE, "Nexthop", + "outgoingIF", "Potential nexthops"); rcu_read_unlock(); spin_lock_irqsave(&orig_hash_lock, flags); @@ -334,9 +337,14 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) addr_to_string(orig_str, orig_node->orig); addr_to_string(router_str, orig_node->router->addr); - - seq_printf(seq, "%-17s (%3i) %17s [%10s]:", - orig_str, orig_node->router->tq_avg, router_str, + last_seen_secs = jiffies_to_msecs(jiffies - + orig_node->last_valid) / 1000; + last_seen_msecs = jiffies_to_msecs(jiffies - + orig_node->last_valid) % 1000; + + seq_printf(seq, "%-17s %4i.%03is (%3i) %17s [%10s]:", + orig_str, last_seen_secs, last_seen_msecs, + orig_node->router->tq_avg, router_str, orig_node->router->if_incoming->dev); list_for_each_entry(neigh_node, &orig_node->neigh_list, list) { -- 1.7.1

3 3

[B.A.T.M.A.N.] [PATCH] batctl: Add timeout filtering option for originators
by Linus Lüssing 01 Jul '10

01 Jul '10

This commit introduces the -t switch for originator table output. It makes use of the new last-seen field in batman-adv, the user can specify a timeout interval in seconds (with 3 digits precision before and after a possible dot) if he/she considers a node as dead after this time. (of course this is just influencing the displaying and not actually declearing a node as dead for routing decisions) Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- batctl/debug.c | 35 ++++++++++++++++++++++++++++++++--- batctl/functions.c | 14 +++++++++++++- batctl/functions.h | 3 ++- batctl/sys.c | 8 ++++---- 4 files changed, 51 insertions(+), 9 deletions(-) diff --git a/batctl/debug.c b/batctl/debug.c index c57355a..04d2ebc 100644 --- a/batctl/debug.c +++ b/batctl/debug.c @@ -40,6 +40,7 @@ void originators_usage(void) printf(" \t -h print this help\n"); printf(" \t -n don't replace mac addresses with bat-host names\n"); printf(" \t -w watch mode - refresh the originator table continuously\n"); + printf(" \t -t timeout interval - don't print originators not seen for xxx.xxx seconds \n"); } void trans_local_usage(void) @@ -74,8 +75,13 @@ int handle_debug_table(int argc, char **argv, char *file_path, void table_usage( int optchar, read_opt = USE_BAT_HOSTS; char full_path[MAX_PATH+1]; char *debugfs_mnt; + int orig_timeout_secs; + int orig_timeout_msecs; + char msecs_buff[4]; + memset(msecs_buff, '0', sizeof(msecs_buff)); + msecs_buff[3] = '\0'; - while ((optchar = getopt(argc, argv, "hnw")) != -1) { + while ((optchar = getopt(argc, argv, "hnwt:")) != -1) { switch (optchar) { case 'h': table_usage(); @@ -86,6 +92,29 @@ int handle_debug_table(int argc, char **argv, char *file_path, void table_usage( case 'w': read_opt |= CLR_CONT_READ; break; + case 't': + if (table_usage != originators_usage) { + table_usage(); + return EXIT_FAILURE; + } + + read_opt |= NO_OLD_ORIGS; + if (sscanf(optarg, "%3d.%3s", &orig_timeout_secs, + msecs_buff) == 2) { + if (strlen(msecs_buff) < 3) + msecs_buff[strlen(msecs_buff)] = '0'; + sscanf(msecs_buff, "%d", &orig_timeout_msecs); + orig_timeout_msecs += 1000 * orig_timeout_secs; + } + else if (sscanf(optarg, "%3d", &orig_timeout_secs) == 1) { ; } + else { + printf("Error - provided argument of -t is not a number\n"); + return EXIT_FAILURE; + } + break; + case '?': + if (optopt == 't' && table_usage == originators_usage) + return EXIT_FAILURE; default: table_usage(); return EXIT_FAILURE; @@ -99,7 +128,7 @@ int handle_debug_table(int argc, char **argv, char *file_path, void table_usage( } debugfs_make_path(DEBUG_BATIF_PATH "/", full_path, sizeof(full_path)); - return read_file(full_path, file_path, read_opt); + return read_file(full_path, file_path, read_opt, orig_timeout_msecs); } static void log_usage(void) @@ -137,7 +166,7 @@ int log_print(int argc, char **argv) } debugfs_make_path(DEBUG_BATIF_PATH "/", full_path, sizeof(full_path)); - res = read_file(full_path, DEBUG_LOG, read_opt); + res = read_file(full_path, DEBUG_LOG, read_opt, 0); if ((res != EXIT_SUCCESS) && (errno == ENOENT)) printf("To read the debug log you need to compile the module with debugging enabled (see the README)\n"); diff --git a/batctl/functions.c b/batctl/functions.c index 9b697b3..272e08b 100644 --- a/batctl/functions.c +++ b/batctl/functions.c @@ -117,11 +117,13 @@ static int check_sys_dir(char *dir) return EXIT_FAILURE; } -int read_file(char *dir, char *fname, int read_opt) +int read_file(char *dir, char *fname, int read_opt, int orig_timeout) { struct ether_addr *mac_addr; struct bat_host *bat_host; int res = EXIT_FAILURE; + int last_seen_secs; + int last_seen_msecs; char full_path[500], *buff_ptr, *space_ptr, extra_char; size_t len = 0; ssize_t read; @@ -157,6 +159,16 @@ read: if (read_opt & USE_READ_BUFF) break; + /* skip timed out originators */ + if (read_opt & NO_OLD_ORIGS) { + if (sscanf(line_ptr, "%*s %3d.%3d", + &last_seen_secs, &last_seen_msecs) == 2) { + last_seen_msecs += 1000 * last_seen_secs; + if (last_seen_msecs > orig_timeout) + continue; + } + } + if (!(read_opt & USE_BAT_HOSTS)) { printf("%s", line_ptr); continue; diff --git a/batctl/functions.h b/batctl/functions.h index 885df34..10903e0 100644 --- a/batctl/functions.h +++ b/batctl/functions.h @@ -33,7 +33,7 @@ double end_timer(void); char *ether_ntoa_long(const struct ether_addr *addr); char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); -int read_file(char *dir, char *path, int read_opt); +int read_file(char *dir, char *path, int read_opt, int orig_timeout); int write_file(char *dir, char *fname, char *arg1, char *arg2); extern char *line_ptr; @@ -46,4 +46,5 @@ enum { LOG_MODE = 0x08, USE_READ_BUFF = 0x10, SILENCE_ERRORS = 0x20, + NO_OLD_ORIGS = 0x40, }; diff --git a/batctl/sys.c b/batctl/sys.c index 321dfc9..7135841 100644 --- a/batctl/sys.c +++ b/batctl/sys.c @@ -79,7 +79,7 @@ static int print_interfaces(void) while ((iface_dir = readdir(iface_base_dir)) != NULL) { snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, iface_dir->d_name); - res = read_file("", path_buff, SINGLE_READ | USE_READ_BUFF | SILENCE_ERRORS); + res = read_file("", path_buff, SINGLE_READ | USE_READ_BUFF | SILENCE_ERRORS, 0); if (res != EXIT_SUCCESS) continue; @@ -93,7 +93,7 @@ static int print_interfaces(void) line_ptr = NULL; snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); - res = read_file("", path_buff, SINGLE_READ | USE_READ_BUFF | SILENCE_ERRORS); + res = read_file("", path_buff, SINGLE_READ | USE_READ_BUFF | SILENCE_ERRORS, 0); if (res != EXIT_SUCCESS) { printf("<error reading status>\n"); continue; @@ -196,7 +196,7 @@ int handle_loglevel(int argc, char **argv) goto out; } - res = read_file(SYS_BATIF_PATH, SYS_LOG_LEVEL, SINGLE_READ | USE_READ_BUFF); + res = read_file(SYS_BATIF_PATH, SYS_LOG_LEVEL, SINGLE_READ | USE_READ_BUFF, 0); if (res != EXIT_SUCCESS) goto out; @@ -271,7 +271,7 @@ int handle_sys_setting(int argc, char **argv, } if (argc == 1) - return read_file(SYS_BATIF_PATH, file_path, SINGLE_READ); + return read_file(SYS_BATIF_PATH, file_path, SINGLE_READ, 0); if (!sysfs_param) goto write_file; -- 1.5.6.5

2 7

[B.A.T.M.A.N.] Dual radio BATMAN Advanced implementation
by Matthew Anderson 01 Jul '10

01 Jul '10

Hi Guys, I'm looking at making a small mesh network using dual radio's and BATMAN advanced and was after some advice to make sure I'm heading the right direction. The application is just a basic hotspot covering a large area, all traffic would need to come back to the captive portal server which would be 2-3 hops away maximum. I'm using OpenWRT with a 5.8GHz 802.11n radio for backhaul and 2.4GHz 802.11b/g for serving non BATMAN clients. I'm going to run BATMAN Adv on the backhaul network and bridge it to the client radio which would effectively make it one giant layer 2 mesh. In this situation, would users on the b/g radio's be able to roam between nodes? Am I better off removing the bridge between the mesh and the client radio and use layer 3 routing or NAT instead? Eventually I'd like to run PPPoE and do some point to point VPN's over the mesh but the hotspot is my starting point. If anyone has any constructive criticism or words of wisdom it would be much appreciated. Thanks -Matt

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N July 2010