From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Tue, 15 Jul 2014 04:23:28 +0200 Message-Id: <1405391008-5112-2-git-send-email-linus.luessing@web.de> In-Reply-To: <1405391008-5112-1-git-send-email-linus.luessing@web.de> References: <1405391008-5112-1-git-send-email-linus.luessing@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Subject: [B.A.T.M.A.N.] [PATCH 2/2] batctl: adding mcast flags debugfs table Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: b.a.t.m.a.n@lists.open-mesh.org This patch adds an option to retrieve the per originator multicast flags table. Signed-off-by: Linus Lüssing --- README | 30 ++++++++++++++++++++++++++++++ debug.c | 6 ++++++ debug.h | 1 + functions.c | 1 + man/batctl.8 | 3 +++ 5 files changed, 41 insertions(+) diff --git a/README b/README index c5e3575..8af6fad 100644 --- a/README +++ b/README @@ -425,6 +425,36 @@ display or modify the multicast mode setting Usage: batctl multicast_mode|mm [0|1] +batctl mcast_flags +================= + +display the local D.A.T. cache + +Usage batctl mcast_flags|mf + +Example: + +Multicast flags (own flags: [...]) + Originator Flags +02:04:64:a4:39:c4 [...] +02:04:64:a4:39:c1 [U46] +02:04:64:a4:39:c3 [...] + +where: +- Originator: the MAC address of the originating (primary interface) + batman-adv node +- Flags: multicast flags of the according node +- U: wants all unsnoopable multicast traffic, meaning other nodes need to always + forward any multicast traffic destined to ff02::1 or 224.0.0.0/24 to it +- 4: wants all IPv4 multicast traffic, meaning other nodes need to always + forward any IPv4 multicast traffic to it +- 6: wants all IPv6 multicast traffic, meaning other nodes need to always + forward any IPv6 multicast traffic to it + +If a node does not have multicast optimizations available (e.g. old batman-adv +version or optimizations not compiled in), therefore not announcing any +multicast tvlv/flags, a '-' will be displayed instead of '[...]'. + batctl aggregation ================== diff --git a/debug.c b/debug.c index dfcf3c3..e00cfa2 100644 --- a/debug.c +++ b/debug.c @@ -78,6 +78,12 @@ const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM] = { .debugfs_name = "nc_nodes", .header_lines = 0, }, + { + .opt_long = "mcast_flags", + .opt_short = "mf", + .debugfs_name = "mcast_flags", + .header_lines = 2, + }, }; static void debug_table_usage(int debug_table) diff --git a/debug.h b/debug.h index 76d5e68..6ea32a4 100644 --- a/debug.h +++ b/debug.h @@ -38,6 +38,7 @@ enum batctl_debug_tables { BATCTL_TABLE_BLA_BACKBONES, BATCTL_TABLE_DAT, BATCTL_TABLE_NETWORK_CODING_NODES, + BATCTL_TABLE_MCAST_FLAGS, BATCTL_TABLE_NUM, }; diff --git a/functions.c b/functions.c index 251e616..7636e85 100644 --- a/functions.c +++ b/functions.c @@ -68,6 +68,7 @@ const char *fs_compile_out_param[] = { 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, + batctl_debug_tables[BATCTL_TABLE_MCAST_FLAGS].debugfs_name, NULL, }; diff --git a/man/batctl.8 b/man/batctl.8 index 110020e..ee2749b 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -227,6 +227,9 @@ List of debug tables: .RS 10 \- nc_nodes|nn (compile time option) .RE +.RS 10 +\- mcast_flags|mf (compile time option) +.RE .RE .br .IP "\fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" -- 1.7.10.4