[v3,2/2] batctl: add unicast/multicast address filter option for TT output
Commit Message
This patch adds the new "-u" and "-m" options for the local and global
translation table output to only display announced unicast or multicast
mac addresses to enhance readability.
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
---
v3: unchanged
debug.c | 32 +++++++++++++++++++++++++++++++-
functions.c | 22 ++++++++++++++++++++++
functions.h | 2 ++
man/batctl.8 | 2 ++
4 files changed, 57 insertions(+), 1 deletion(-)
Comments
On Tuesday 11 March 2014 21:04:33 Linus Lüssing wrote:
> This patch adds the new "-u" and "-m" options for the local and global
> translation table output to only display announced unicast or multicast
> mac addresses to enhance readability.
>
> Signed-off-by: Linus Lüssing <linus.luessing@web.de>
> ---
> v3: unchanged
>
> debug.c | 32 +++++++++++++++++++++++++++++++-
> functions.c | 22 ++++++++++++++++++++++
> functions.h | 2 ++
> man/batctl.8 | 2 ++
> 4 files changed, 57 insertions(+), 1 deletion(-)
Applied in revision 6202831.
Thanks,
Marek
On Wed, Mar 12, 2014 at 03:32:37PM +0800, Marek Lindner wrote:
> On Tuesday 11 March 2014 21:04:33 Linus Lüssing wrote:
> > This patch adds the new "-u" and "-m" options for the local and global
> > translation table output to only display announced unicast or multicast
> > mac addresses to enhance readability.
> >
> > Signed-off-by: Linus Lüssing <linus.luessing@web.de>
> > ---
> > v3: unchanged
> >
> > debug.c | 32 +++++++++++++++++++++++++++++++-
> > functions.c | 22 ++++++++++++++++++++++
> > functions.h | 2 ++
> > man/batctl.8 | 2 ++
> > 4 files changed, 57 insertions(+), 1 deletion(-)
>
> Applied in revision 6202831.
>
> Thanks,
> Marek
Hi Marek,
Hm, was it? Can't find it - am I looking at the wrong places?
Cheers, Linus
On Monday 21 April 2014 03:58:21 Linus Lüssing wrote:
> Hm, was it? Can't find it - am I looking at the wrong places?
Where are you looking ?
git show 6202831
Cheers,
Marek
On Mon, Apr 21, 2014 at 11:27:23AM +0800, Marek Lindner wrote:
> On Monday 21 April 2014 03:58:21 Linus Lüssing wrote:
> > Hm, was it? Can't find it - am I looking at the wrong places?
>
> Where are you looking ?
>
> git show 6202831
>
>
git show 6202831 does indeed show it for me. However this one
doesn't:
$ git branch --contains 6202831
Also on http://git.open-mesh.org/batctl.git I don't seem to be
able to find it, like:
http://git.open-mesh.org/batctl.git?a=search&h=HEAD&st=commit&s=multicast+address+filter+option
Cheers, Linus
On Mon, Apr 21, 2014 at 12:42:57PM +0200, Linus Lüssing wrote:
>
>
> On Mon, Apr 21, 2014 at 11:27:23AM +0800, Marek Lindner wrote:
> > On Monday 21 April 2014 03:58:21 Linus Lüssing wrote:
> > > Hm, was it? Can't find it - am I looking at the wrong places?
> >
> > Where are you looking ?
> >
> > git show 6202831
> >
> >
>
> git show 6202831 does indeed show it for me. However this one
> doesn't:
>
> $ git branch --contains 6202831
>
> Also on http://git.open-mesh.org/batctl.git I don't seem to be
> able to find it, like:
>
> http://git.open-mesh.org/batctl.git?a=search&h=HEAD&st=commit&s=multicast+address+filter+option
>
> Cheers, Linus
Doing a clean git clone: The change is there, but - git blame/diff
tell me it's actually in 6a0489b4. Did this patch accidentally
get squashed into 6a0489b4 ("batctl: add switch for setting
multicast_mode")?
@@ -91,6 +91,10 @@ static void debug_table_usage(int debug_table)
if (debug_table == BATCTL_TABLE_ORIGINATORS)
fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n");
+ if (debug_table == BATCTL_TABLE_TRANSLOCAL ||
+ debug_table == BATCTL_TABLE_TRANSGLOBAL) {
+ fprintf(stderr, " \t -u|-m print unicast or multicast mac addresses only\n");
+ }
}
int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv)
@@ -102,7 +106,7 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv)
float watch_interval = 1;
opterr = 0;
- while ((optchar = getopt(argc, argv, "hnw:t:H")) != -1) {
+ while ((optchar = getopt(argc, argv, "hnw:t:Hum")) != -1) {
switch (optchar) {
case 'h':
debug_table_usage(debug_table);
@@ -138,6 +142,26 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv)
case 'H':
read_opt |= SKIP_HEADER;
break;
+ case 'u':
+ if (debug_table != BATCTL_TABLE_TRANSLOCAL &&
+ debug_table != BATCTL_TABLE_TRANSGLOBAL) {
+ fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar);
+ debug_table_usage(debug_table);
+ return EXIT_FAILURE;
+ }
+
+ read_opt |= UNICAST_ONLY;
+ break;
+ case 'm':
+ if (debug_table != BATCTL_TABLE_TRANSLOCAL &&
+ debug_table != BATCTL_TABLE_TRANSGLOBAL) {
+ fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar);
+ debug_table_usage(debug_table);
+ return EXIT_FAILURE;
+ }
+
+ read_opt |= MULTICAST_ONLY;
+ break;
case '?':
if (optopt == 't')
fprintf(stderr, "Error - option '-t' needs a number as argument\n");
@@ -156,6 +180,12 @@ int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv)
}
}
+ if (read_opt & UNICAST_ONLY && read_opt & MULTICAST_ONLY) {
+ fprintf(stderr, "Error - '-u' and '-m' are exclusive options\n");
+ debug_table_usage(debug_table);
+ return EXIT_FAILURE;
+ }
+
debugfs_mnt = debugfs_mount(NULL);
if (!debugfs_mnt) {
fprintf(stderr, "Error - can't mount or find debugfs\n");
@@ -175,6 +175,14 @@ static void file_open_problem_dbg(const char *dir, const char *fname,
}
}
+static int str_is_mcast_addr(char *addr)
+{
+ struct ether_addr *mac_addr = ether_aton(addr);
+
+ return !mac_addr ? 0 :
+ mac_addr->ether_addr_octet[0] & 0x01;
+}
+
int read_file(const char *dir, const char *fname, int read_opt,
float orig_timeout, float watch_interval, size_t header_lines)
{
@@ -224,6 +232,20 @@ read:
&& (last_seen > orig_timeout))
continue;
+ /* translation table: skip multicast */
+ if (line > header_lines &&
+ read_opt & UNICAST_ONLY &&
+ strlen(line_ptr) > strlen(" * xx:xx:xx:") &&
+ str_is_mcast_addr(line_ptr+3))
+ continue;
+
+ /* translation table: skip unicast */
+ if (line > header_lines &&
+ read_opt & MULTICAST_ONLY &&
+ strlen(line_ptr) > strlen(" * xx:xx:xx:") &&
+ !str_is_mcast_addr(line_ptr+3))
+ continue;
+
if (!(read_opt & USE_BAT_HOSTS)) {
printf("%s", line_ptr);
continue;
@@ -57,6 +57,8 @@ enum {
NO_OLD_ORIGS = 0x40,
COMPAT_FILTER = 0x80,
SKIP_HEADER = 0x100,
+ UNICAST_ONLY = 0x200,
+ MULTICAST_ONLY = 0x400,
};
#endif
@@ -198,6 +198,8 @@ All of the debug tables support the following options:
The originator table also supports the "\-t" filter option to remove all originators from the output that have not been seen
for the specified amount of seconds (with optional decimal places).
+The local and global translation tables also support the "\-u" and "\-m" option to only display unicast or multicast translation table announcements respectively.
+
List of debug tables:
.RS 10
\- originators|o