Signed-off-by: Martin Hundebøll martin@hundeboll.net --- README | 18 ++++++++++++++++++ debug.c | 6 ++++++ debug.h | 1 + functions.c | 1 + man/batctl.8 | 3 +++ 5 files changed, 29 insertions(+)

diff --git a/README b/README index 2bc085e..f19a081 100644 --- a/README +++ b/README @@ -363,6 +363,24 @@ $ batctl loglevel [ ] messages related to bridge loop avoidance (bla) [ ] messages related to arp snooping and distributed arp table (dat)

+batctl nc_nodes +=============== + +display the neighbor nodes considered for network coded packets + +Usage: batctl nc_nodes|nn + +Example: + +Node: fe:fe:00:0a:01:01 + Ingoing: fe:fe:00:0a:01:01 fe:fe:00:0a:02:01 + Outgoing: fe:fe:00:0a:01:01 fe:fe:00:0a:02:01 + +Where: +- Node is the neighbor +- Ingoing is the neighbors this neighbor can hear packets from +- Outgoing is the neighbors that can hear packets from this neighbor + batctl network_coding =====================

diff --git a/debug.c b/debug.c index 9b9e385..c879603 100644 --- a/debug.c +++ b/debug.c @@ -76,6 +76,12 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .debugfs_name = "dat_cache", .header_lines = 2, }, + { + .opt_long = "nc_nodes", + .opt_short = "nn", + .debugfs_name = "nc_nodes", + .header_lines = 0, + }, };

void debug_table_usage(int debug_table) diff --git a/debug.h b/debug.h index 60dd9a8..2427ece 100644 --- a/debug.h +++ b/debug.h @@ -33,6 +33,7 @@ enum batctl_debug_tables { BATCTL_TABLE_BLA_CLAIMS, BATCTL_TABLE_BLA_BACKBONES, BATCTL_TABLE_DAT, + BATCTL_TABLE_NETWORK_CODING_NODES, BATCTL_TABLE_NUM, };

diff --git a/functions.c b/functions.c index 14fb45e..a025395 100644 --- a/functions.c +++ b/functions.c @@ -55,6 +55,7 @@ const char *fs_compile_out_param[] = { batctl_debug_tables[BATCTL_TABLE_BLA_CLAIMS].debugfs_name, batctl_debug_tables[BATCTL_TABLE_BLA_BACKBONES].debugfs_name, batctl_debug_tables[BATCTL_TABLE_DAT].debugfs_name, + batctl_debug_tables[BATCTL_TABLE_NETWORK_CODING_NODES].debugfs_name, NULL, };

diff --git a/man/batctl.8 b/man/batctl.8 index 533fdb7..6f8d210 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -204,6 +204,9 @@ List of debug tables: .RS 10 - dat_cache|dc (compile time option) .RE +.RS 10 +- nc_nodes|nn (compile time option) +.RE .RE .br .IP "\fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat-host_name\fP|\fBhost_name\fP|\fBIPv4_address\fP"

Signed-off-by: Martin Hundebøll martin@hundeboll.net --- README | 1 + man/batctl.8 | 7 ++++--- sys.c | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README b/README index f19a081..fd421e1 100644 --- a/README +++ b/README @@ -362,6 +362,7 @@ $ batctl loglevel [ ] messages related to translation table operations (tt) [ ] messages related to bridge loop avoidance (bla) [ ] messages related to arp snooping and distributed arp table (dat) +[ ] messages related to network coding (nc)

batctl nc_nodes =============== diff --git a/man/batctl.8 b/man/batctl.8 index 6f8d210..38060d6 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -96,9 +96,10 @@ If no parameter is given the current log level settings are displayed otherwise level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. 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 '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. +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. .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 74a6c65..3258105 100644 --- a/sys.c +++ b/sys.c @@ -275,6 +275,7 @@ static void log_level_usage(void) fprintf(stderr, " \t tt Messages related to translation table operations\n"); 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"); }

int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -306,7 +307,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level = 0; break; } else if (strcmp(argv[i], "all") == 0) { - log_level = 31; + log_level = 63; break; } else if (strcmp(argv[i], "batman") == 0) log_level |= BIT(0); @@ -318,6 +319,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= BIT(3); else if (strcmp(argv[i], "dat") == 0) log_level |= BIT(4); + else if (strcmp(argv[i], "nc") == 0) + log_level |= BIT(5); else { log_level_usage(); goto out; @@ -350,6 +353,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to bridge loop avoidance", "bla"); printf("[%c] %s (%s)\n", (log_level & BIT(4)) ? 'x' : ' ', "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");

out: free(path_buff);