From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 26/38] batctl: Move transglobal debug table to own file
Date: Mon, 22 Oct 2018 00:55:12 +0200 [thread overview]
Message-ID: <20181021225524.8155-27-sven@narfation.org> (raw)
In-Reply-To: <20181021225524.8155-1-sven@narfation.org>
The netlink.c file contains to many different functions and mixes helper
functions with actual command implementations. The debug table commands
should be placed in separate files to better group the command specific
code sections together.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Makefile | 1 +
debug.c | 11 ----
netlink.c | 112 -----------------------------------
netlink.h | 2 -
transglobal.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 160 insertions(+), 125 deletions(-)
create mode 100644 transglobal.c
diff --git a/Makefile b/Makefile
index 059c602..ef0c28b 100755
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,7 @@ OBJ += sys.o
OBJ += tcpdump.o
OBJ += throughputmeter.o
OBJ += traceroute.o
+OBJ += transglobal.o
OBJ += translate.o
MANPAGE = man/batctl.8
diff --git a/debug.c b/debug.c
index f4cc2ea..5f2ad04 100644
--- a/debug.c
+++ b/debug.c
@@ -210,14 +210,3 @@ static struct debug_table_data batctl_debug_table_translocal = {
COMMAND_NAMED(DEBUGTABLE, translocal, "tl", handle_debug_table,
COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_translocal, "");
-
-static struct debug_table_data batctl_debug_table_transglobal = {
- .debugfs_name = "transtable_global",
- .header_lines = 2,
- .netlink_fn = netlink_print_transglobal,
- .option_unicast_only = 1,
- .option_multicast_only = 1,
-};
-
-COMMAND_NAMED(DEBUGTABLE, transglobal, "tg", handle_debug_table,
- COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_transglobal, "");
diff --git a/netlink.c b/netlink.c
index cbb73ac..6583696 100644
--- a/netlink.c
+++ b/netlink.c
@@ -456,107 +456,6 @@ int netlink_print_routing_algos(void)
return last_err;
}
-static const int transglobal_mandatory[] = {
- BATADV_ATTR_TT_ADDRESS,
- BATADV_ATTR_ORIG_ADDRESS,
- BATADV_ATTR_TT_VID,
- BATADV_ATTR_TT_TTVN,
- BATADV_ATTR_TT_LAST_TTVN,
- BATADV_ATTR_TT_CRC32,
- BATADV_ATTR_TT_FLAGS,
-};
-
-static int transglobal_callback(struct nl_msg *msg, void *arg)
-{
- struct nlattr *attrs[BATADV_ATTR_MAX+1];
- struct nlmsghdr *nlh = nlmsg_hdr(msg);
- struct print_opts *opts = arg;
- struct bat_host *bat_host;
- struct genlmsghdr *ghdr;
- char c, r, w, i, t;
- uint8_t last_ttvn;
- uint32_t crc32;
- uint32_t flags;
- uint8_t *addr;
- uint8_t *orig;
- uint8_t ttvn;
- int16_t vid;
-
- if (!genlmsg_valid_hdr(nlh, 0)) {
- fputs("Received invalid data from kernel.\n", stderr);
- exit(1);
- }
-
- ghdr = nlmsg_data(nlh);
-
- if (ghdr->cmd != BATADV_CMD_GET_TRANSTABLE_GLOBAL)
- return NL_OK;
-
- if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0),
- genlmsg_len(ghdr), batadv_netlink_policy)) {
- fputs("Received invalid data from kernel.\n", stderr);
- exit(1);
- }
-
- if (missing_mandatory_attrs(attrs, transglobal_mandatory,
- ARRAY_SIZE(transglobal_mandatory))) {
- fputs("Missing attributes from kernel\n", stderr);
- exit(1);
- }
-
- addr = nla_data(attrs[BATADV_ATTR_TT_ADDRESS]);
- orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]);
- vid = nla_get_u16(attrs[BATADV_ATTR_TT_VID]);
- ttvn = nla_get_u8(attrs[BATADV_ATTR_TT_TTVN]);
- last_ttvn = nla_get_u8(attrs[BATADV_ATTR_TT_LAST_TTVN]);
- crc32 = nla_get_u32(attrs[BATADV_ATTR_TT_CRC32]);
- flags = nla_get_u32(attrs[BATADV_ATTR_TT_FLAGS]);
-
- if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01))
- return NL_OK;
-
- if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01))
- return NL_OK;
-
- c = ' ', r = '.', w = '.', i = '.', t = '.';
- if (attrs[BATADV_ATTR_FLAG_BEST])
- c = '*';
- if (flags & BATADV_TT_CLIENT_ROAM)
- r = 'R';
- if (flags & BATADV_TT_CLIENT_WIFI)
- w = 'W';
- if (flags & BATADV_TT_CLIENT_ISOLA)
- i = 'I';
- if (flags & BATADV_TT_CLIENT_TEMP)
- t = 'T';
-
- printf(" %c ", c);
-
- bat_host = bat_hosts_find_by_mac((char *)addr);
- if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host)
- printf("%02x:%02x:%02x:%02x:%02x:%02x ",
- addr[0], addr[1], addr[2],
- addr[3], addr[4], addr[5]);
- else
- printf("%17s ", bat_host->name);
-
- printf("%4i [%c%c%c%c] (%3u) ",
- BATADV_PRINT_VID(vid), r, w, i, t, ttvn);
-
- bat_host = bat_hosts_find_by_mac((char *)orig);
- if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host)
- printf("%02x:%02x:%02x:%02x:%02x:%02x ",
- orig[0], orig[1], orig[2],
- orig[3], orig[4], orig[5]);
- else
- printf("%17s ", bat_host->name);
-
- printf("(%3u) (0x%.8x)\n",
- last_ttvn, crc32);
-
- return NL_OK;
-}
-
static const int translocal_mandatory[] = {
BATADV_ATTR_TT_ADDRESS,
BATADV_ATTR_TT_VID,
@@ -760,17 +659,6 @@ int netlink_print_common(char *mesh_iface, char *orig_iface, int read_opt,
return last_err;
}
-int netlink_print_transglobal(char *mesh_iface, char *orig_iface,
- int read_opts, float orig_timeout,
- float watch_interval)
-{
- return netlink_print_common(mesh_iface, orig_iface, read_opts,
- orig_timeout, watch_interval,
- " Client VID Flags Last ttvn Via ttvn (CRC )\n",
- BATADV_CMD_GET_TRANSTABLE_GLOBAL,
- transglobal_callback);
-}
-
int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opts,
float orig_timeout,
float watch_interval)
diff --git a/netlink.h b/netlink.h
index a099482..1cec0f7 100644
--- a/netlink.h
+++ b/netlink.h
@@ -40,8 +40,6 @@ struct print_opts {
struct ether_addr;
int netlink_print_routing_algos(void);
-int netlink_print_transglobal(char *mesh_iface, char *orig_iface, int read_opt,
- float orig_timeout, float watch_interval);
int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opt,
float orig_timeout, float watch_interval);
diff --git a/transglobal.c b/transglobal.c
new file mode 100644
index 0000000..f67682a
--- /dev/null
+++ b/transglobal.c
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner <mareklindner@neomailbox.ch>
+ *
+ * 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
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ */
+
+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "batadv_packet.h"
+#include "batman_adv.h"
+#include "bat-hosts.h"
+#include "debug.h"
+#include "functions.h"
+#include "main.h"
+#include "netlink.h"
+
+static const int transglobal_mandatory[] = {
+ BATADV_ATTR_TT_ADDRESS,
+ BATADV_ATTR_ORIG_ADDRESS,
+ BATADV_ATTR_TT_VID,
+ BATADV_ATTR_TT_TTVN,
+ BATADV_ATTR_TT_LAST_TTVN,
+ BATADV_ATTR_TT_CRC32,
+ BATADV_ATTR_TT_FLAGS,
+};
+
+static int transglobal_callback(struct nl_msg *msg, void *arg)
+{
+ struct nlattr *attrs[BATADV_ATTR_MAX+1];
+ struct nlmsghdr *nlh = nlmsg_hdr(msg);
+ struct print_opts *opts = arg;
+ struct bat_host *bat_host;
+ struct genlmsghdr *ghdr;
+ char c, r, w, i, t;
+ uint8_t last_ttvn;
+ uint32_t crc32;
+ uint32_t flags;
+ uint8_t *addr;
+ uint8_t *orig;
+ uint8_t ttvn;
+ int16_t vid;
+
+ if (!genlmsg_valid_hdr(nlh, 0)) {
+ fputs("Received invalid data from kernel.\n", stderr);
+ exit(1);
+ }
+
+ ghdr = nlmsg_data(nlh);
+
+ if (ghdr->cmd != BATADV_CMD_GET_TRANSTABLE_GLOBAL)
+ return NL_OK;
+
+ if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0),
+ genlmsg_len(ghdr), batadv_netlink_policy)) {
+ fputs("Received invalid data from kernel.\n", stderr);
+ exit(1);
+ }
+
+ if (missing_mandatory_attrs(attrs, transglobal_mandatory,
+ ARRAY_SIZE(transglobal_mandatory))) {
+ fputs("Missing attributes from kernel\n", stderr);
+ exit(1);
+ }
+
+ addr = nla_data(attrs[BATADV_ATTR_TT_ADDRESS]);
+ orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]);
+ vid = nla_get_u16(attrs[BATADV_ATTR_TT_VID]);
+ ttvn = nla_get_u8(attrs[BATADV_ATTR_TT_TTVN]);
+ last_ttvn = nla_get_u8(attrs[BATADV_ATTR_TT_LAST_TTVN]);
+ crc32 = nla_get_u32(attrs[BATADV_ATTR_TT_CRC32]);
+ flags = nla_get_u32(attrs[BATADV_ATTR_TT_FLAGS]);
+
+ if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01))
+ return NL_OK;
+
+ if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01))
+ return NL_OK;
+
+ c = ' ', r = '.', w = '.', i = '.', t = '.';
+ if (attrs[BATADV_ATTR_FLAG_BEST])
+ c = '*';
+ if (flags & BATADV_TT_CLIENT_ROAM)
+ r = 'R';
+ if (flags & BATADV_TT_CLIENT_WIFI)
+ w = 'W';
+ if (flags & BATADV_TT_CLIENT_ISOLA)
+ i = 'I';
+ if (flags & BATADV_TT_CLIENT_TEMP)
+ t = 'T';
+
+ printf(" %c ", c);
+
+ bat_host = bat_hosts_find_by_mac((char *)addr);
+ if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host)
+ printf("%02x:%02x:%02x:%02x:%02x:%02x ",
+ addr[0], addr[1], addr[2],
+ addr[3], addr[4], addr[5]);
+ else
+ printf("%17s ", bat_host->name);
+
+ printf("%4i [%c%c%c%c] (%3u) ",
+ BATADV_PRINT_VID(vid), r, w, i, t, ttvn);
+
+ bat_host = bat_hosts_find_by_mac((char *)orig);
+ if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host)
+ printf("%02x:%02x:%02x:%02x:%02x:%02x ",
+ orig[0], orig[1], orig[2],
+ orig[3], orig[4], orig[5]);
+ else
+ printf("%17s ", bat_host->name);
+
+ printf("(%3u) (0x%.8x)\n",
+ last_ttvn, crc32);
+
+ return NL_OK;
+}
+
+static int netlink_print_transglobal(char *mesh_iface, char *orig_iface,
+ int read_opts, float orig_timeout,
+ float watch_interval)
+{
+ return netlink_print_common(mesh_iface, orig_iface, read_opts,
+ orig_timeout, watch_interval,
+ " Client VID Flags Last ttvn Via ttvn (CRC )\n",
+ BATADV_CMD_GET_TRANSTABLE_GLOBAL,
+ transglobal_callback);
+}
+
+static struct debug_table_data batctl_debug_table_transglobal = {
+ .debugfs_name = "transtable_global",
+ .header_lines = 2,
+ .netlink_fn = netlink_print_transglobal,
+ .option_unicast_only = 1,
+ .option_multicast_only = 1,
+};
+
+COMMAND_NAMED(DEBUGTABLE, transglobal, "tg", handle_debug_table,
+ COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_transglobal, "");
--
2.19.1
next prev parent reply other threads:[~2018-10-21 22:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-21 22:54 [B.A.T.M.A.N.] [PATCH 00/38] batctl: pre-netlink restructuring, part 1 Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 01/38] batctl: Drop unused define SOCKET_PATH_FMT Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 02/38] batctl: Use common code organization for statistics Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 03/38] batctl: Drop legacy vis_* related warning messages Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 04/38] batctl: Move loglevel command to separate file Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 05/38] batctl: Move log " Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 06/38] batctl: Move gw_mode " Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 07/38] batctl: Move routing_algo " Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 08/38] batctl: Rename tp_meter to throughputmeter Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 09/38] batctl: Introduce datastructure for subcommands Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 10/38] batctl: Add per command flags Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 11/38] batctl: Use command structure for remaining subcommands Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 12/38] batctl: Use getopt to parse main options Sven Eckelmann
2018-10-21 22:54 ` [B.A.T.M.A.N.] [PATCH 13/38] batctl: Store usage line next to command Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 14/38] batctl: Prepare command infrastructure for shared functions Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 15/38] batctl: Add type to command to structure usage output Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 16/38] batctl: Convert debug table to command infrastructure Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 17/38] batctl: Convert sysfs settings " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 18/38] batctl: Move backbonetable debug table to own file Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 19/38] batctl: Move claimtable " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 20/38] batctl: Move dat_cache " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 21/38] batctl: Move gateways " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 22/38] batctl: Move mcast_flags " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 23/38] batctl: Move nc_nodes " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 24/38] batctl: Move neighbors " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 25/38] batctl: Move originators " Sven Eckelmann
2018-10-21 22:55 ` Sven Eckelmann [this message]
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 27/38] batctl: Move translocal " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 28/38] batctl: Move aggregation setting " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 29/38] batctl: Move bonding " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 30/38] batctl: Move bridge_loop_avoidance " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 31/38] batctl: Move distributed_arp_table " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 32/38] batctl: Move fragmentation " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 33/38] batctl: Move isolation_mark " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 34/38] batctl: Move multicast_mode " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 35/38] batctl: Move network_coding " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 36/38] batctl: Move orig_interval " Sven Eckelmann
2018-10-21 23:02 ` [B.A.T.M.A.N.] [PATCH v2 " Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 37/38] batctl: Use external netlink socket for debug tables Sven Eckelmann
2018-10-21 22:55 ` [B.A.T.M.A.N.] [PATCH 38/38] batctl: Add command to monitor for netlink events Sven Eckelmann
2018-10-22 16:42 ` [B.A.T.M.A.N.] [PATCH 00/38] batctl: pre-netlink restructuring, part 1 Sven Eckelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181021225524.8155-27-sven@narfation.org \
--to=sven@narfation.org \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).