commits November 2018

commits@lists.open-mesh.org

1 participants
87 discussions

[batctl] master: batctl: Add command to monitor for netlink events (5d7850e)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 5d7850e3582ee4258640c4963041d1ce17d9a41a Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:43 2018 +0200 batctl: Add command to monitor for netlink events The netlink multicast groups of batman-adv are currently used to inform userspace about finished throughputmeter runs. It will later also be used to inform about changes of settings of a specific batadv interface. The "event" will wait for these messages and print brief summaries about the received data. This can be used during the development of new features or to monitor running systems. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5d7850e3582ee4258640c4963041d1ce17d9a41a Makefile | 1 + event.c | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ man/batctl.8 | 4 + 3 files changed, 251 insertions(+) diff --git a/Makefile b/Makefile index a6971d8..cf2b1c7 100755 --- a/Makefile +++ b/Makefile @@ -43,6 +43,7 @@ OBJ += dat_cache.o OBJ += debugfs.o OBJ += debug.o OBJ += distributed_arp_table.o +OBJ += event.o OBJ += fragmentation.o OBJ += functions.o OBJ += gateways.o diff --git a/event.c b/event.c new file mode 100644 index 0000000..8eda269 --- /dev/null +++ b/event.c @@ -0,0 +1,246 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: + * + * Sven Eckelmann <sven(a)narfation.org> + * + * 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 <errno.h> +#include <getopt.h> +#include <netinet/if_ether.h> +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <sys/time.h> + +#include "batadv_packet.h" +#include "batman_adv.h" +#include "bat-hosts.h" +#include "debug.h" +#include "functions.h" +#include "genl.h" +#include "main.h" +#include "netlink.h" + +enum event_time_mode { + EVENT_TIME_NO, + EVENT_TIME_LOCAL, + EVENT_TIME_RELATIVE, +}; + +struct event_args { + enum event_time_mode mode; + struct timeval tv; +}; + +static void event_usage(void) +{ + fprintf(stderr, "Usage: batctl [options] event [parameters]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -t print local timestamp\n"); + fprintf(stderr, " \t -r print relative timestamp\n"); +} + +static int event_prepare(struct state *state) +{ + int ret; + int mcid; + + if (!state->sock) + return -EOPNOTSUPP; + + mcid = nl_get_multicast_id(state->sock, BATADV_NL_NAME, + BATADV_NL_MCAST_GROUP_TPMETER); + if (mcid < 0) { + fprintf(stderr, "Failed to resolve batadv tp_meter multicast group: %d\n", + mcid); + /* ignore error for now */ + goto skip_tp_meter; + } + + ret = nl_socket_add_membership(state->sock, mcid); + if (ret) { + fprintf(stderr, "Failed to join batadv tp_meter multicast group: %d\n", + ret); + /* ignore error for now */ + goto skip_tp_meter; + } + +skip_tp_meter: + + return 0; +} + +static int no_seq_check(struct nl_msg *msg __maybe_unused, + void *arg __maybe_unused) +{ + return NL_OK; +} + +static const int tp_meter_mandatory[] = { + BATADV_ATTR_TPMETER_COOKIE, + BATADV_ATTR_TPMETER_RESULT, +}; + +static void event_parse_tp_meter(struct nlattr **attrs) +{ + const char *result_str; + uint32_t cookie; + uint8_t result; + + /* ignore entry when attributes are missing */ + if (missing_mandatory_attrs(attrs, tp_meter_mandatory, + ARRAY_SIZE(tp_meter_mandatory))) + return; + + cookie = nla_get_u32(attrs[BATADV_ATTR_TPMETER_COOKIE]); + result = nla_get_u8(attrs[BATADV_ATTR_TPMETER_RESULT]); + + switch (result) { + case BATADV_TP_REASON_DST_UNREACHABLE: + result_str = "Destination unreachable"; + break; + case BATADV_TP_REASON_RESEND_LIMIT: + result_str = "The number of retry for the same window exceeds the limit, test aborted"; + break; + case BATADV_TP_REASON_ALREADY_ONGOING: + result_str = "Cannot run two test towards the same node"; + break; + case BATADV_TP_REASON_MEMORY_ERROR: + result_str = "Kernel cannot allocate memory, aborted"; + break; + case BATADV_TP_REASON_TOO_MANY: + result_str = "Too many ongoing sessions"; + break; + case BATADV_TP_REASON_CANCEL: + result_str = "CANCEL received: test aborted"; + break; + case BATADV_TP_REASON_COMPLETE: + result_str = "complete"; + break; + default: + result_str = "unknown"; + break; + } + + printf("tp_meter 0x%08x: %s\n", cookie, result_str); +} + +static unsigned long long get_timestamp(struct event_args *event_args) +{ + unsigned long long prevtime = 0; + unsigned long long now; + struct timeval tv; + + gettimeofday(&tv, NULL); + now = 1000000ULL * tv.tv_sec + tv.tv_usec; + + if (event_args->mode == EVENT_TIME_RELATIVE) { + prevtime = 1000000ULL * event_args->tv.tv_sec + event_args->tv.tv_usec; + event_args->tv = tv; + } + + return now - prevtime; +} + +static int event_parse(struct nl_msg *msg, void *arg) +{ + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct nlattr *attrs[NUM_BATADV_ATTR]; + struct event_args *event_args = arg; + unsigned long long timestamp; + struct genlmsghdr *ghdr; + + if (!genlmsg_valid_hdr(nlh, 0)) + return NL_OK; + + ghdr = nlmsg_data(nlh); + + 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); + return NL_OK; + } + + if (event_args->mode != EVENT_TIME_NO) { + timestamp = get_timestamp(event_args); + printf("%llu.%06llu: ", timestamp / 1000000, timestamp % 1000000); + } + + switch (ghdr->cmd) { + case BATADV_CMD_TP_METER: + event_parse_tp_meter(attrs); + break; + default: + printf("Received unknown event %u\n", ghdr->cmd); + break; + } + + return NL_OK; +} + +static int event(struct state *state, int argc, char **argv) +{ + struct event_args event_args = { + .mode = EVENT_TIME_NO, + }; + int opt; + int ret; + + while ((opt = getopt(argc, argv, "htr")) != -1) { + switch (opt) { + case 'h': + event_usage(); + return EXIT_SUCCESS; + case 't': + event_args.mode = EVENT_TIME_LOCAL; + break; + case 'r': + event_args.mode = EVENT_TIME_RELATIVE; + break; + default: + event_usage(); + return EXIT_FAILURE; + } + } + + ret = event_prepare(state); + if (ret < 0) { + fprintf(stderr, "Failed to prepare event netlink: %s (%d)\n", + strerror(-ret), -ret); + return 1; + } + + if (event_args.mode == EVENT_TIME_RELATIVE) + get_timestamp(&event_args); + + nl_cb_set(state->cb, NL_CB_SEQ_CHECK, NL_CB_CUSTOM, no_seq_check, NULL); + nl_cb_set(state->cb, NL_CB_VALID, NL_CB_CUSTOM, event_parse, &event_args); + + while (1) + nl_recvmsgs(state->sock, state->cb); + + return 0; +} + +COMMAND(SUBCOMMAND, event, "e", COMMAND_FLAG_NETLINK, NULL, + " \tdisplay events from batman-adv"); diff --git a/man/batctl.8 b/man/batctl.8 index 3e21028..2e3232f 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -89,6 +89,10 @@ OGM packet aggregation. If no parameter is given the current bonding mode setting is displayed. Otherwise the parameter is used to enable or disable the bonding mode. .br +.IP "\fBevent\fP|\fBe\fP [\fB\-t\fP|\fB\-r\fP]" +batctl will monitor for events from the netlink kernel interface of batman-adv. The local timestamp of the event will be printed +when parameter \fB\-t\fP is specified. Parameter \fB\-r\fP will do the same but with relative timestamps. +.br .IP "\fBfragmentation\fP|\fBf\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current fragmentation mode setting is displayed. Otherwise the parameter is used to enable or disable fragmentation.

1 0

[batctl] master: batctl: Move aggregation setting to own file (c2fbdcd)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit c2fbdcd127925009156678959f96ee5bb7d74ea2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:31 2018 +0200 batctl: Move aggregation setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- c2fbdcd127925009156678959f96ee5bb7d74ea2 Makefile | 1 + nc_nodes.c => aggregation.c | 13 +++++++------ sys.c | 9 --------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 93db44a..dfc59af 100755 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ BINARY_NAME = batctl OBJ_BISECT = bisect_iv.o +OBJ += aggregation.o OBJ += bat-hosts.o OBJ += backbonetable.o ifeq ($(CONFIG_BATCTL_BISECT),y) diff --git a/nc_nodes.c b/aggregation.c similarity index 72% copy from nc_nodes.c copy to aggregation.c index 9cf437d..57c1dbb 100644 --- a/nc_nodes.c +++ b/aggregation.c @@ -20,13 +20,14 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ -#include "debug.h" #include "main.h" +#include "sys.h" -static struct debug_table_data batctl_debug_table_nc_nodes = { - .debugfs_name = DEBUG_NC_NODES, - .header_lines = 0, +static struct settings_data batctl_settings_aggregation = { + .sysfs_name = "aggregated_ogms", + .params = sysfs_param_enable, }; -COMMAND_NAMED(DEBUGTABLE, nc_nodes, "nn", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_nc_nodes, ""); +COMMAND_NAMED(SUBCOMMAND, aggregation, "ag", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_aggregation, + "[0|1] \tdisplay or modify aggregation setting"); diff --git a/sys.c b/sys.c index 08b389e..00e452c 100644 --- a/sys.c +++ b/sys.c @@ -173,15 +173,6 @@ COMMAND_NAMED(SUBCOMMAND, distributed_arp_table, "dat", handle_sys_setting, COMMAND_FLAG_MESH_IFACE, &batctl_settings_distributed_arp_table, "[0|1] \tdisplay or modify distributed_arp_table setting"); -static struct settings_data batctl_settings_aggregation = { - .sysfs_name = "aggregated_ogms", - .params = sysfs_param_enable, -}; - -COMMAND_NAMED(SUBCOMMAND, aggregation, "ag", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_aggregation, - "[0|1] \tdisplay or modify aggregation setting"); - static struct settings_data batctl_settings_bonding = { .sysfs_name = "bonding", .params = sysfs_param_enable,

1 0

[batctl] master: batctl: Move bonding setting to own file (0e3f1d1)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0e3f1d1e3768160913127ed008ea6e1429537649 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:33 2018 +0200 batctl: Move bonding setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0e3f1d1e3768160913127ed008ea6e1429537649 Makefile | 1 + aggregation.c => bonding.c | 10 +++++----- sys.c | 9 --------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 0a72595..c1b8484 100755 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ OBJ += backbonetable.o ifeq ($(CONFIG_BATCTL_BISECT),y) OBJ += $(OBJ_BISECT) endif +OBJ += bonding.o OBJ += claimtable.o OBJ += dat_cache.o OBJ += debugfs.o diff --git a/aggregation.c b/bonding.c similarity index 76% copy from aggregation.c copy to bonding.c index 57c1dbb..f7105c9 100644 --- a/aggregation.c +++ b/bonding.c @@ -23,11 +23,11 @@ #include "main.h" #include "sys.h" -static struct settings_data batctl_settings_aggregation = { - .sysfs_name = "aggregated_ogms", +static struct settings_data batctl_settings_bonding = { + .sysfs_name = "bonding", .params = sysfs_param_enable, }; -COMMAND_NAMED(SUBCOMMAND, aggregation, "ag", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_aggregation, - "[0|1] \tdisplay or modify aggregation setting"); +COMMAND_NAMED(SUBCOMMAND, bonding, "b", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_bonding, + "[0|1] \tdisplay or modify bonding setting"); diff --git a/sys.c b/sys.c index 80d9fa1..8ad925e 100644 --- a/sys.c +++ b/sys.c @@ -164,15 +164,6 @@ COMMAND_NAMED(SUBCOMMAND, distributed_arp_table, "dat", handle_sys_setting, COMMAND_FLAG_MESH_IFACE, &batctl_settings_distributed_arp_table, "[0|1] \tdisplay or modify distributed_arp_table setting"); -static struct settings_data batctl_settings_bonding = { - .sysfs_name = "bonding", - .params = sysfs_param_enable, -}; - -COMMAND_NAMED(SUBCOMMAND, bonding, "b", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_bonding, - "[0|1] \tdisplay or modify bonding setting"); - static struct settings_data batctl_settings_fragmentation = { .sysfs_name = "fragmentation", .params = sysfs_param_enable,

1 0

[batctl] master: batctl: Prepare command infrastructure for shared functions (21107a8)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 21107a80c3d538870b9919cbccdd583e2c435f05 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:17 2018 +0200 batctl: Prepare command infrastructure for shared functions The command structure first mapped from one name and abbrevation to a single function of batctl. But there can be commands which share a significant portion of the code. To support these kind of things better, add an additional arg pointer to the command structure. The handler then receive a state struct from the main function instead of the mesh_iface. The command implementation can then use the state to retrieve both the mesh_iface and the cmd with the arg pointer. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 21107a80c3d538870b9919cbccdd583e2c435f05 bisect_iv.c | 4 ++-- gw_mode.c | 6 +++--- interface.c | 20 ++++++++++---------- log.c | 6 +++--- loglevel.c | 6 +++--- main.c | 29 +++++++++++++++++++---------- main.h | 15 +++++++++++---- ping.c | 8 ++++---- routing_algo.c | 4 ++-- statistics.c | 6 +++--- tcpdump.c | 4 ++-- throughputmeter.c | 8 ++++---- traceroute.c | 8 ++++---- translate.c | 6 +++--- 14 files changed, 73 insertions(+), 57 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index 6da82b9..c6fc708 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1441,7 +1441,7 @@ err: return 0; } -static int bisect_iv(char *mesh_iface __maybe_unused, int argc, char **argv) +static int bisect_iv(struct state *state __maybe_unused, int argc, char **argv) { int ret = EXIT_FAILURE, res, optchar, found_args = 1; int read_opt = USE_BAT_HOSTS, num_parsed_files; @@ -1595,5 +1595,5 @@ err: return ret; } -COMMAND(bisect_iv, "bisect_iv", 0, +COMMAND(bisect_iv, "bisect_iv", 0, NULL, "<file1> .. <fileN>\tanalyze given batman iv log files for routing stability"); diff --git a/gw_mode.c b/gw_mode.c index da22ff0..bd530d5 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -45,7 +45,7 @@ static void gw_mode_usage(void) fprintf(stderr, " \t -h print this help\n"); } -static int gw_mode(char *mesh_iface, int argc, char **argv) +static int gw_mode(struct state *state, int argc, char **argv) { int optchar, res = EXIT_FAILURE; char *path_buff, gw_mode; @@ -68,7 +68,7 @@ static int gw_mode(char *mesh_iface, int argc, char **argv) return EXIT_FAILURE; } - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, state->mesh_iface); if (argc == 1) { res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0, 0); @@ -167,5 +167,5 @@ out: return res; } -COMMAND(gw_mode, "gw", COMMAND_FLAG_MESH_IFACE, +COMMAND(gw_mode, "gw", COMMAND_FLAG_MESH_IFACE, NULL, "[mode] \tdisplay or modify the gateway mode"); diff --git a/interface.c b/interface.c index d2883a9..5f69cb3 100644 --- a/interface.c +++ b/interface.c @@ -297,7 +297,7 @@ err_free_msg: return err; } -static int interface(char *mesh_iface, int argc, char **argv) +static int interface(struct state *state, int argc, char **argv) { int i, optchar; int ret; @@ -327,7 +327,7 @@ static int interface(char *mesh_iface, int argc, char **argv) rest_argv = &argv[optind]; if (rest_argc == 0) - return print_interfaces(mesh_iface); + return print_interfaces(state->mesh_iface); check_root_or_die("batctl interface"); @@ -370,7 +370,7 @@ static int interface(char *mesh_iface, int argc, char **argv) switch (rest_argv[0][0]) { case 'c': - ret = create_interface(mesh_iface); + ret = create_interface(state->mesh_iface); if (ret < 0) { fprintf(stderr, "Error - failed to add create batman-adv interface: %s\n", @@ -379,7 +379,7 @@ static int interface(char *mesh_iface, int argc, char **argv) } return EXIT_SUCCESS; case 'D': - ret = destroy_interface(mesh_iface); + ret = destroy_interface(state->mesh_iface); if (ret < 0) { fprintf(stderr, "Error - failed to destroy batman-adv interface: %s\n", @@ -392,9 +392,9 @@ static int interface(char *mesh_iface, int argc, char **argv) } /* get index of batman-adv interface - or try to create it */ - ifmaster = if_nametoindex(mesh_iface); + ifmaster = if_nametoindex(state->mesh_iface); if (!manual_mode && !ifmaster && rest_argv[0][0] == 'a') { - ret = create_interface(mesh_iface); + ret = create_interface(state->mesh_iface); if (ret < 0) { fprintf(stderr, "Error - failed to create batman-adv interface: %s\n", @@ -402,7 +402,7 @@ static int interface(char *mesh_iface, int argc, char **argv) goto err; } - ifmaster = if_nametoindex(mesh_iface); + ifmaster = if_nametoindex(state->mesh_iface); } if (!ifmaster) { @@ -447,9 +447,9 @@ static int interface(char *mesh_iface, int argc, char **argv) /* check if there is no interface left and then destroy mesh_iface */ if (!manual_mode && rest_argv[0][0] == 'd') { - cnt = count_interfaces(mesh_iface); + cnt = count_interfaces(state->mesh_iface); if (cnt == 0) - destroy_interface(mesh_iface); + destroy_interface(state->mesh_iface); } return EXIT_SUCCESS; @@ -458,5 +458,5 @@ err: return EXIT_FAILURE; } -COMMAND(interface, "if", 0, +COMMAND(interface, "if", 0, NULL, "[add|del iface(s)]\tdisplay or modify the interface settings"); diff --git a/log.c b/log.c index e28466d..b4f0b86 100644 --- a/log.c +++ b/log.c @@ -36,7 +36,7 @@ static void log_usage(void) fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); } -static int log_print(char *mesh_iface, int argc, char **argv) +static int log_print(struct state *state, int argc, char **argv) { int optchar, res, read_opt = USE_BAT_HOSTS | LOG_MODE; char full_path[MAX_PATH+1]; @@ -64,10 +64,10 @@ static int log_print(char *mesh_iface, int argc, char **argv) return EXIT_FAILURE; } - debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", state->mesh_iface, full_path, sizeof(full_path)); res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0, 0); return res; } -COMMAND_NAMED(log, "l", log_print, COMMAND_FLAG_MESH_IFACE, +COMMAND_NAMED(log, "l", log_print, COMMAND_FLAG_MESH_IFACE, NULL, " \tread the log produced by the kernel module"); diff --git a/loglevel.c b/loglevel.c index 3dc1a1c..7a61524 100644 --- a/loglevel.c +++ b/loglevel.c @@ -47,7 +47,7 @@ static void log_level_usage(void) fprintf(stderr, " \t tp Messages related to throughput meter\n"); } -static int loglevel(char *mesh_iface, int argc, char **argv) +static int loglevel(struct state *state, int argc, char **argv) { int optchar, res = EXIT_FAILURE; int log_level = 0; @@ -72,7 +72,7 @@ static int loglevel(char *mesh_iface, int argc, char **argv) return EXIT_FAILURE; } - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, state->mesh_iface); if (argc != 1) { check_root_or_die("batctl loglevel"); @@ -143,5 +143,5 @@ out: return res; } -COMMAND(loglevel, "ll", COMMAND_FLAG_MESH_IFACE, +COMMAND(loglevel, "ll", COMMAND_FLAG_MESH_IFACE, NULL, "[level] \tdisplay or modify the log level"); diff --git a/main.c b/main.c index b9b19de..e20f914 100644 --- a/main.c +++ b/main.c @@ -127,7 +127,10 @@ int main(int argc, char **argv) { const struct command *cmd; int i, ret = EXIT_FAILURE; - char *mesh_iface = mesh_dfl_iface; + struct state state = { + .mesh_iface = mesh_dfl_iface, + .cmd = NULL, + }; int opt; while ((opt = getopt(argc, argv, "+hm:v")) != -1) { @@ -137,13 +140,13 @@ int main(int argc, char **argv) exit(EXIT_SUCCESS); break; case 'm': - if (mesh_iface != mesh_dfl_iface) { + if (state.mesh_iface != mesh_dfl_iface) { fprintf(stderr, "Error - multiple mesh interfaces specified\n"); goto err; } - mesh_iface = argv[2]; + state.mesh_iface = argv[2]; break; case 'v': version(); @@ -163,16 +166,22 @@ int main(int argc, char **argv) optind = 0; if ((cmd = find_command(argv[0]))) { + state.cmd = cmd; + if (cmd->flags & COMMAND_FLAG_MESH_IFACE && - check_mesh_iface(mesh_iface) < 0) { - fprintf(stderr, "Error - interface %s is not present or not a batman-adv interface\n", mesh_iface); + check_mesh_iface(state.mesh_iface) < 0) { + fprintf(stderr, + "Error - interface %s is not present or not a batman-adv interface\n", + state.mesh_iface); exit(EXIT_FAILURE); } - ret = cmd->handler(mesh_iface, argc, argv); + ret = cmd->handler(&state, argc, argv); } else { - if (check_mesh_iface(mesh_iface) < 0) { - fprintf(stderr, "Error - interface %s is not present or not a batman-adv interface\n", mesh_iface); + if (check_mesh_iface(state.mesh_iface) < 0) { + fprintf(stderr, + "Error - interface %s is not present or not a batman-adv interface\n", + state.mesh_iface); exit(EXIT_FAILURE); } @@ -181,7 +190,7 @@ int main(int argc, char **argv) (strcmp(argv[0], batctl_settings[i].opt_short) != 0)) continue; - ret = handle_sys_setting(mesh_iface, i, argc, argv); + ret = handle_sys_setting(state.mesh_iface, i, argc, argv); goto out; } @@ -190,7 +199,7 @@ int main(int argc, char **argv) (strcmp(argv[0], batctl_debug_tables[i].opt_short) != 0)) continue; - ret = handle_debug_table(mesh_iface, i, argc, argv); + ret = handle_debug_table(state.mesh_iface, i, argc, argv); goto out; } diff --git a/main.h b/main.h index b39e350..77eb432 100644 --- a/main.h +++ b/main.h @@ -61,26 +61,33 @@ enum command_flags { COMMAND_FLAG_MESH_IFACE = BIT(0), }; +struct state { + char *mesh_iface; + const struct command *cmd; +}; + struct command { const char *name; const char *abbr; - int (*handler)(char *mesh_iface, int argc, char **argv); + int (*handler)(struct state *state, int argc, char **argv); uint32_t flags; + void *arg; const char *usage; }; -#define COMMAND_NAMED(_name, _abbr, _handler, _flags, _usage) \ +#define COMMAND_NAMED(_name, _abbr, _handler, _flags, _arg, _usage) \ static const struct command command_ ## _name = { \ .name = (#_name), \ .abbr = _abbr, \ .handler = (_handler), \ .flags = (_flags), \ + .arg = (_arg), \ .usage = (_usage), \ }; \ static const struct command *__command_ ## _name \ __attribute__((__used__)) __attribute__ ((__section__ ("__command"))) = &command_ ## _name -#define COMMAND(_handler, _abbr, _flags, _usage) \ - COMMAND_NAMED(_handler, _abbr, _handler, _flags, _usage) +#define COMMAND(_handler, _abbr, _flags, _arg, _usage) \ + COMMAND_NAMED(_handler, _abbr, _handler, _flags, _arg, _usage) #endif diff --git a/ping.c b/ping.c index efaf011..24af0e8 100644 --- a/ping.c +++ b/ping.c @@ -72,7 +72,7 @@ static void sig_handler(int sig) } } -static int ping(char *mesh_iface, int argc, char **argv) +static int ping(struct state *state, int argc, char **argv) { struct batadv_icmp_packet_rr icmp_packet_out, icmp_packet_in; struct timeval tv; @@ -152,7 +152,7 @@ static int ping(char *mesh_iface, int argc, char **argv) } if (!disable_translate_mac) - dst_mac = translate_mac(mesh_iface, dst_mac); + dst_mac = translate_mac(state->mesh_iface, dst_mac); mac_string = ether_ntoa_long(dst_mac); signal(SIGINT, sig_handler); @@ -199,7 +199,7 @@ static int ping(char *mesh_iface, int argc, char **argv) icmp_packet_out.seqno = htons(++seq_counter); - res = icmp_interface_write(mesh_iface, + res = icmp_interface_write(state->mesh_iface, (struct batadv_icmp_header *)&icmp_packet_out, packet_len); if (res < 0) { @@ -345,5 +345,5 @@ out: return ret; } -COMMAND(ping, "p", COMMAND_FLAG_MESH_IFACE, +COMMAND(ping, "p", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \tping another batman adv host via layer 2"); diff --git a/routing_algo.c b/routing_algo.c index 8cc4ff1..30e588b 100644 --- a/routing_algo.c +++ b/routing_algo.c @@ -41,7 +41,7 @@ static void ra_mode_usage(void) fprintf(stderr, " \t -h print this help\n"); } -static int routing_algo(char *mesh_iface __maybe_unused, int argc, char **argv) +static int routing_algo(struct state *state __maybe_unused, int argc, char **argv) { DIR *iface_base_dir; struct dirent *iface_dir; @@ -126,5 +126,5 @@ out: return res; } -COMMAND(routing_algo, "ra", 0, +COMMAND(routing_algo, "ra", 0, NULL, "[mode] \tdisplay or modify the routing algorithm"); diff --git a/statistics.c b/statistics.c index 908bbaf..26ffe44 100644 --- a/statistics.c +++ b/statistics.c @@ -102,14 +102,14 @@ out: return ret; } -static int statistics(char *mesh_iface, int argc __maybe_unused, +static int statistics(struct state *state, int argc __maybe_unused, char **argv __maybe_unused) { struct ifreq ifr; int fd = -1, ret = EXIT_FAILURE; memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, mesh_iface, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, state->mesh_iface, sizeof(ifr.ifr_name)); ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0'; fd = socket(AF_INET, SOCK_DGRAM, 0); @@ -126,5 +126,5 @@ out: return ret; } -COMMAND(statistics, "s", COMMAND_FLAG_MESH_IFACE, +COMMAND(statistics, "s", COMMAND_FLAG_MESH_IFACE, NULL, " \tprint mesh statistics"); diff --git a/tcpdump.c b/tcpdump.c index 62e4a64..5c93842 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1210,7 +1210,7 @@ static void sig_handler(int sig) } } -static int tcpdump(char *mesh_iface __maybe_unused, int argc, char **argv) +static int tcpdump(struct state *state __maybe_unused, int argc, char **argv) { struct timeval tv; struct dump_if *dump_if, *dump_if_tmp; @@ -1352,5 +1352,5 @@ out: return ret; } -COMMAND(tcpdump, "td", 0, +COMMAND(tcpdump, "td", 0, NULL, "<interface> \ttcpdump layer 2 traffic on the given interface"); diff --git a/throughputmeter.c b/throughputmeter.c index ebd35a6..0c5e38a 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -388,7 +388,7 @@ static void tp_meter_usage(void) fprintf(stderr, "\t -n don't convert addresses to bat-host names\n"); } -static int throughputmeter(char *mesh_iface, int argc, char **argv) +static int throughputmeter(struct state *state, int argc, char **argv) { struct bat_host *bat_host; uint64_t throughput; @@ -458,7 +458,7 @@ static int throughputmeter(char *mesh_iface, int argc, char **argv) dst_string = ether_ntoa_long(dst_mac); /* for sighandler */ - tp_mesh_iface = mesh_iface; + tp_mesh_iface = state->mesh_iface; signal(SIGINT, tp_sig_handler); signal(SIGTERM, tp_sig_handler); @@ -466,7 +466,7 @@ static int throughputmeter(char *mesh_iface, int argc, char **argv) if (!listen_sock) goto out; - ret = tp_meter_start(mesh_iface, dst_mac, time, &cookie); + ret = tp_meter_start(state->mesh_iface, dst_mac, time, &cookie); if (ret < 0) { printf("Failed to send tp_meter request to kernel: %d\n", ret); goto out; @@ -543,5 +543,5 @@ out: return ret; } -COMMAND(throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, +COMMAND(throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \tstart a throughput measurement"); diff --git a/traceroute.c b/traceroute.c index 9446bcd..77c3188 100644 --- a/traceroute.c +++ b/traceroute.c @@ -55,7 +55,7 @@ static void traceroute_usage(void) fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } -static int traceroute(char *mesh_iface, int argc, char **argv) +static int traceroute(struct state *state, int argc, char **argv) { struct batadv_icmp_packet icmp_packet_out, icmp_packet_in; struct bat_host *bat_host; @@ -113,7 +113,7 @@ static int traceroute(char *mesh_iface, int argc, char **argv) } if (!disable_translate_mac) - dst_mac = translate_mac(mesh_iface, dst_mac); + dst_mac = translate_mac(state->mesh_iface, dst_mac); mac_string = ether_ntoa_long(dst_mac); @@ -146,7 +146,7 @@ static int traceroute(char *mesh_iface, int argc, char **argv) icmp_packet_out.seqno = htons(++seq_counter); time_delta[i] = 0.0; - res = icmp_interface_write(mesh_iface, + res = icmp_interface_write(state->mesh_iface, (struct batadv_icmp_header *)&icmp_packet_out, sizeof(icmp_packet_out)); if (res < 0) { @@ -231,5 +231,5 @@ out: return ret; } -COMMAND(traceroute, "tr", COMMAND_FLAG_MESH_IFACE, +COMMAND(traceroute, "tr", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \ttraceroute another batman adv host via layer 2"); diff --git a/translate.c b/translate.c index 95de9a2..38f26df 100644 --- a/translate.c +++ b/translate.c @@ -33,7 +33,7 @@ static void translate_usage(void) fprintf(stderr, "Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); } -static int translate(char *mesh_iface, int argc, char **argv) +static int translate(struct state *state, int argc, char **argv) { struct ether_addr *dst_mac = NULL; struct bat_host *bat_host; @@ -64,7 +64,7 @@ static int translate(char *mesh_iface, int argc, char **argv) } } - dst_mac = translate_mac(mesh_iface, dst_mac); + dst_mac = translate_mac(state->mesh_iface, dst_mac); if (dst_mac) { mac_string = ether_ntoa_long(dst_mac); printf("%s\n", mac_string); @@ -78,5 +78,5 @@ out: return ret; } -COMMAND(translate, "t", COMMAND_FLAG_MESH_IFACE, +COMMAND(translate, "t", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \ttranslate a destination to the originator responsible for it");

1 0

[batctl] master: batctl: Move gateways debug table to own file (0ca89f7)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0ca89f7993253a3e33fd28eb3911ef81a5e024cd Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:24 2018 +0200 batctl: Move gateways debug table to own file 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(a)narfation.org> >--------------------------------------------------------------- 0ca89f7993253a3e33fd28eb3911ef81a5e024cd Makefile | 1 + debug.c | 9 ---- gateways.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.c | 130 ++------------------------------------------- netlink.h | 8 +-- 5 files changed, 183 insertions(+), 140 deletions(-) diff --git a/Makefile b/Makefile index 648c7bc..3a8e785 100755 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ OBJ += dat_cache.o OBJ += debugfs.o OBJ += debug.o OBJ += functions.o +OBJ += gateways.o OBJ += genl.o OBJ += gw_mode.o OBJ += hash.o diff --git a/debug.c b/debug.c index 29c8252..7bf8bff 100644 --- a/debug.c +++ b/debug.c @@ -220,15 +220,6 @@ static struct debug_table_data batctl_debug_table_originators = { COMMAND_NAMED(DEBUGTABLE, originators, "o", handle_debug_table, COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_originators, ""); -static struct debug_table_data batctl_debug_table_gateways = { - .debugfs_name = "gateways", - .header_lines = 1, - .netlink_fn = netlink_print_gateways, -}; - -COMMAND_NAMED(DEBUGTABLE, gateways, "gwl", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_gateways, ""); - static struct debug_table_data batctl_debug_table_translocal = { .debugfs_name = "transtable_local", .header_lines = 2, diff --git a/gateways.c b/gateways.c new file mode 100644 index 0000000..f81bf20 --- /dev/null +++ b/gateways.c @@ -0,0 +1,175 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: + * + * Andrew Lunn <andrew(a)lunn.ch> + * Sven Eckelmann <sven(a)narfation.org> + * + * 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 <errno.h> +#include <net/if.h> +#include <netinet/if_ether.h> +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.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 gateways_mandatory[] = { + BATADV_ATTR_ORIG_ADDRESS, + BATADV_ATTR_ROUTER, + BATADV_ATTR_HARD_IFNAME, + BATADV_ATTR_BANDWIDTH_DOWN, + BATADV_ATTR_BANDWIDTH_UP, +}; + +static int gateways_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; + const char *primary_if; + uint32_t bandwidth_down; + uint32_t bandwidth_up; + uint32_t throughput; + uint8_t *router; + uint8_t *orig; + char c = ' '; + uint8_t tq; + + 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_GATEWAYS) + 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, gateways_mandatory, + ARRAY_SIZE(gateways_mandatory))) { + fputs("Missing attributes from kernel\n", stderr); + exit(1); + } + + if (attrs[BATADV_ATTR_FLAG_BEST]) + c = '*'; + + orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); + router = nla_data(attrs[BATADV_ATTR_ROUTER]); + primary_if = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + bandwidth_down = nla_get_u32(attrs[BATADV_ATTR_BANDWIDTH_DOWN]); + bandwidth_up = nla_get_u32(attrs[BATADV_ATTR_BANDWIDTH_UP]); + + printf("%c ", c); + + 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); + + if (attrs[BATADV_ATTR_THROUGHPUT]) { + throughput = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT]); + printf("(%9u.%1u) ", throughput / 10, throughput % 10); + } else if (attrs[BATADV_ATTR_TQ]) { + tq = nla_get_u8(attrs[BATADV_ATTR_TQ]); + printf("(%3i) ", tq); + } + + bat_host = bat_hosts_find_by_mac((char *)router); + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + router[0], router[1], router[2], + router[3], router[4], router[5]); + else + printf("%17s ", bat_host->name); + + printf("[%10s]: %u.%u/%u.%u MBit\n", + primary_if, bandwidth_down / 10, bandwidth_down % 10, + bandwidth_up / 10, bandwidth_up % 10); + + return NL_OK; +} + +static int netlink_print_gateways(char *mesh_iface, char *orig_iface, + int read_opts, float orig_timeout, + float watch_interval) +{ + char *header = NULL; + char *info_header; + int ifindex; + + ifindex = if_nametoindex(mesh_iface); + if (!ifindex) { + fprintf(stderr, "Interface %s is unknown\n", mesh_iface); + return -ENODEV; + } + + /* only parse routing algorithm name */ + last_err = -EINVAL; + info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); + free(info_header); + + if (strlen(algo_name_buf) == 0) + return last_err; + + if (!strcmp("BATMAN_IV", algo_name_buf)) + header = " Router ( TQ) Next Hop [outgoingIf] Bandwidth\n"; + if (!strcmp("BATMAN_V", algo_name_buf)) + header = " Router ( throughput) Next Hop [outgoingIf] Bandwidth\n"; + + if (!header) + return -EINVAL; + + return netlink_print_common(mesh_iface, orig_iface, read_opts, + orig_timeout, watch_interval, + header, + BATADV_CMD_GET_GATEWAYS, + gateways_callback); +} + +static struct debug_table_data batctl_debug_table_gateways = { + .debugfs_name = "gateways", + .header_lines = 1, + .netlink_fn = netlink_print_gateways, +}; + +COMMAND_NAMED(DEBUGTABLE, gateways, "gwl", handle_debug_table, + COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_gateways, ""); diff --git a/netlink.c b/netlink.c index 42fe4a0..c3b2bad 100644 --- a/netlink.c +++ b/netlink.c @@ -109,8 +109,8 @@ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_MCAST_FLAGS_PRIV] = { .type = NLA_U32 }, }; -static int last_err; -static char algo_name_buf[256] = ""; +int last_err; +char algo_name_buf[256] = ""; static int64_t mcast_flags = -EOPNOTSUPP; static int64_t mcast_flags_priv = -EOPNOTSUPP; @@ -283,7 +283,7 @@ static int info_callback(struct nl_msg *msg, void *arg) return NL_STOP; } -static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) +char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) { struct nl_sock *sock; struct nl_msg *msg; @@ -876,94 +876,6 @@ static int translocal_callback(struct nl_msg *msg, void *arg) return NL_OK; } -static const int gateways_mandatory[] = { - BATADV_ATTR_ORIG_ADDRESS, - BATADV_ATTR_ROUTER, - BATADV_ATTR_HARD_IFNAME, - BATADV_ATTR_BANDWIDTH_DOWN, - BATADV_ATTR_BANDWIDTH_UP, -}; - -static int gateways_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; - const char *primary_if; - uint32_t bandwidth_down; - uint32_t bandwidth_up; - uint32_t throughput; - uint8_t *router; - uint8_t *orig; - char c = ' '; - uint8_t tq; - - 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_GATEWAYS) - 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, gateways_mandatory, - ARRAY_SIZE(gateways_mandatory))) { - fputs("Missing attributes from kernel\n", stderr); - exit(1); - } - - if (attrs[BATADV_ATTR_FLAG_BEST]) - c = '*'; - - orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); - router = nla_data(attrs[BATADV_ATTR_ROUTER]); - primary_if = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); - bandwidth_down = nla_get_u32(attrs[BATADV_ATTR_BANDWIDTH_DOWN]); - bandwidth_up = nla_get_u32(attrs[BATADV_ATTR_BANDWIDTH_UP]); - - printf("%c ", c); - - 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); - - if (attrs[BATADV_ATTR_THROUGHPUT]) { - throughput = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT]); - printf("(%9u.%1u) ", throughput / 10, throughput % 10); - } else if (attrs[BATADV_ATTR_TQ]) { - tq = nla_get_u8(attrs[BATADV_ATTR_TQ]); - printf("(%3i) ", tq); - } - - bat_host = bat_hosts_find_by_mac((char *)router); - if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) - printf("%02x:%02x:%02x:%02x:%02x:%02x ", - router[0], router[1], router[2], - router[3], router[4], router[5]); - else - printf("%17s ", bat_host->name); - - printf("[%10s]: %u.%u/%u.%u MBit\n", - primary_if, bandwidth_down / 10, bandwidth_down % 10, - bandwidth_up / 10, bandwidth_up % 10); - - return NL_OK; -} - static const int mcast_flags_mandatory[] = { BATADV_ATTR_ORIG_ADDRESS, }; @@ -1205,42 +1117,6 @@ int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opts, translocal_callback); } -int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opts, - float orig_timeout, - float watch_interval) -{ char *header = NULL; - char *info_header; - int ifindex; - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - fprintf(stderr, "Interface %s is unknown\n", mesh_iface); - return -ENODEV; - } - - /* only parse routing algorithm name */ - last_err = -EINVAL; - info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); - free(info_header); - - if (strlen(algo_name_buf) == 0) - return last_err; - - if (!strcmp("BATMAN_IV", algo_name_buf)) - header = " Router ( TQ) Next Hop [outgoingIf] Bandwidth\n"; - if (!strcmp("BATMAN_V", algo_name_buf)) - header = " Router ( throughput) Next Hop [outgoingIf] Bandwidth\n"; - - if (!header) - return -EINVAL; - - return netlink_print_common(mesh_iface, orig_iface, read_opts, - orig_timeout, watch_interval, - header, - BATADV_CMD_GET_GATEWAYS, - gateways_callback); -} - int netlink_print_mcast_flags(char *mesh_iface, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) { diff --git a/netlink.h b/netlink.h index 7549838..ecf4b01 100644 --- a/netlink.h +++ b/netlink.h @@ -43,17 +43,14 @@ int netlink_print_originators(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); int netlink_print_neighbors(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); -int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opt, - float orig_timeout, float watch_interval); 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); -int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opt, - float orig_timeout, float watch_interval); int netlink_print_mcast_flags(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); +char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header); int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, struct ether_addr *mac_out); int get_nexthop_netlink(const char *mesh_iface, const struct ether_addr *mac, @@ -69,4 +66,7 @@ int netlink_print_common(char *mesh_iface, char *orig_iface, int read_opt, const char *header, uint8_t nl_cmd, nl_recvmsg_msg_cb_t callback); +extern char algo_name_buf[256]; +extern int last_err; + #endif /* _BATCTL_NETLINK_H */

1 0

[batctl] master: batctl: Add type to command to structure usage output (7fdc0f4)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 7fdc0f4a40475a418aa302788949aaf261861661 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:18 2018 +0200 batctl: Add type to command to structure usage output The usage output of batctl is structured in different sections. This should be preserved when the remaining subcommands are converted to the command infrastructure. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7fdc0f4a40475a418aa302788949aaf261861661 bisect_iv.c | 2 +- gw_mode.c | 2 +- interface.c | 2 +- log.c | 2 +- loglevel.c | 2 +- main.c | 68 +++++++++++++++++++++++++++++++++++-------------------- main.h | 12 +++++++--- ping.c | 2 +- routing_algo.c | 2 +- statistics.c | 2 +- tcpdump.c | 2 +- throughputmeter.c | 2 +- traceroute.c | 2 +- translate.c | 2 +- 14 files changed, 64 insertions(+), 40 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index c6fc708..420317e 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1595,5 +1595,5 @@ err: return ret; } -COMMAND(bisect_iv, "bisect_iv", 0, NULL, +COMMAND(SUBCOMMAND, bisect_iv, "bisect_iv", 0, NULL, "<file1> .. <fileN>\tanalyze given batman iv log files for routing stability"); diff --git a/gw_mode.c b/gw_mode.c index bd530d5..4093f89 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -167,5 +167,5 @@ out: return res; } -COMMAND(gw_mode, "gw", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND, gw_mode, "gw", COMMAND_FLAG_MESH_IFACE, NULL, "[mode] \tdisplay or modify the gateway mode"); diff --git a/interface.c b/interface.c index 5f69cb3..3c176a8 100644 --- a/interface.c +++ b/interface.c @@ -458,5 +458,5 @@ err: return EXIT_FAILURE; } -COMMAND(interface, "if", 0, NULL, +COMMAND(SUBCOMMAND, interface, "if", 0, NULL, "[add|del iface(s)]\tdisplay or modify the interface settings"); diff --git a/log.c b/log.c index b4f0b86..cd69676 100644 --- a/log.c +++ b/log.c @@ -69,5 +69,5 @@ static int log_print(struct state *state, int argc, char **argv) return res; } -COMMAND_NAMED(log, "l", log_print, COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND_NAMED(SUBCOMMAND, log, "l", log_print, COMMAND_FLAG_MESH_IFACE, NULL, " \tread the log produced by the kernel module"); diff --git a/loglevel.c b/loglevel.c index 7a61524..fed70c8 100644 --- a/loglevel.c +++ b/loglevel.c @@ -143,5 +143,5 @@ out: return res; } -COMMAND(loglevel, "ll", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND, loglevel, "ll", COMMAND_FLAG_MESH_IFACE, NULL, "[level] \tdisplay or modify the log level"); diff --git a/main.c b/main.c index e20f914..251d753 100644 --- a/main.c +++ b/main.c @@ -41,45 +41,63 @@ extern const struct command *__stop___command[]; static void print_usage(void) { + enum command_type type[] = { + SUBCOMMAND, + }; const struct command **p; - int i, opt_indent; + int opt_indent; char buf[32]; + size_t i; + size_t j; fprintf(stderr, "Usage: batctl [options] command|debug table [parameters]\n"); fprintf(stderr, "options:\n"); fprintf(stderr, " \t-m mesh interface or VLAN created on top of a mesh interface (default 'bat0')\n"); fprintf(stderr, " \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n"); fprintf(stderr, " \t-v print version\n"); - fprintf(stderr, "\n"); - fprintf(stderr, "commands:\n"); + for (i = 0; i < sizeof(type) / sizeof(*type); i++) { + fprintf(stderr, "\n"); - for (p = __start___command; p < __stop___command; p++) { - const struct command *cmd = *p; + switch (type[i]) { + case SUBCOMMAND: + fprintf(stderr, "commands:\n"); + break; + } - if (strcmp(cmd->name, cmd->abbr) == 0) - snprintf(buf, sizeof(buf), "%s", cmd->name); - else - snprintf(buf, sizeof(buf), "%s|%s", cmd->name, - cmd->abbr); + for (p = __start___command; p < __stop___command; p++) { + const struct command *cmd = *p; - fprintf(stderr, " \t%-27s%s\n", buf, cmd->usage); - } + if (cmd->type != type[i]) + continue; + + if (strcmp(cmd->name, cmd->abbr) == 0) + snprintf(buf, sizeof(buf), "%s", cmd->name); + else + snprintf(buf, sizeof(buf), "%s|%s", cmd->name, + cmd->abbr); + + fprintf(stderr, " \t%-27s%s\n", buf, cmd->usage); + } - for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { - fprintf(stderr, " \t%s|%s", batctl_settings[i].opt_long, batctl_settings[i].opt_short); - opt_indent = strlen(batctl_settings[i].opt_long) + strlen(batctl_settings[i].opt_short); - - if (batctl_settings[i].params == sysfs_param_enable) - fprintf(stderr, "%*s display or modify %s setting\n", - 31 - opt_indent, "[0|1]", batctl_settings[i].opt_long); - else if (batctl_settings[i].params == sysfs_param_server) - fprintf(stderr, "%*s display or modify %s setting\n", - 41 - opt_indent, "[client|server]", batctl_settings[i].opt_long); - else - fprintf(stderr, " display or modify %s setting\n", - batctl_settings[i].opt_long); + if (type[i] == SUBCOMMAND) { + for (j = 0; j < BATCTL_SETTINGS_NUM; j++) { + fprintf(stderr, " \t%s|%s", batctl_settings[j].opt_long, batctl_settings[j].opt_short); + opt_indent = strlen(batctl_settings[j].opt_long) + strlen(batctl_settings[j].opt_short); + + if (batctl_settings[j].params == sysfs_param_enable) + fprintf(stderr, "%*s display or modify %s setting\n", + 31 - opt_indent, "[0|1]", batctl_settings[j].opt_long); + else if (batctl_settings[j].params == sysfs_param_server) + fprintf(stderr, "%*s display or modify %s setting\n", + 41 - opt_indent, "[client|server]", batctl_settings[j].opt_long); + else + fprintf(stderr, " display or modify %s setting\n", + batctl_settings[j].opt_long); + } + } } + fprintf(stderr, "\n"); fprintf(stderr, "debug tables: \tdisplay the corresponding debug table\n"); diff --git a/main.h b/main.h index 77eb432..052304c 100644 --- a/main.h +++ b/main.h @@ -61,12 +61,17 @@ enum command_flags { COMMAND_FLAG_MESH_IFACE = BIT(0), }; +enum command_type { + SUBCOMMAND, +}; + struct state { char *mesh_iface; const struct command *cmd; }; struct command { + enum command_type type; const char *name; const char *abbr; int (*handler)(struct state *state, int argc, char **argv); @@ -75,8 +80,9 @@ struct command { const char *usage; }; -#define COMMAND_NAMED(_name, _abbr, _handler, _flags, _arg, _usage) \ +#define COMMAND_NAMED(_type, _name, _abbr, _handler, _flags, _arg, _usage) \ static const struct command command_ ## _name = { \ + .type = (_type), \ .name = (#_name), \ .abbr = _abbr, \ .handler = (_handler), \ @@ -87,7 +93,7 @@ struct command { static const struct command *__command_ ## _name \ __attribute__((__used__)) __attribute__ ((__section__ ("__command"))) = &command_ ## _name -#define COMMAND(_handler, _abbr, _flags, _arg, _usage) \ - COMMAND_NAMED(_handler, _abbr, _handler, _flags, _arg, _usage) +#define COMMAND(_type, _handler, _abbr, _flags, _arg, _usage) \ + COMMAND_NAMED(_type, _handler, _abbr, _handler, _flags, _arg, _usage) #endif diff --git a/ping.c b/ping.c index 24af0e8..5c13d81 100644 --- a/ping.c +++ b/ping.c @@ -345,5 +345,5 @@ out: return ret; } -COMMAND(ping, "p", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND, ping, "p", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \tping another batman adv host via layer 2"); diff --git a/routing_algo.c b/routing_algo.c index 30e588b..ded9284 100644 --- a/routing_algo.c +++ b/routing_algo.c @@ -126,5 +126,5 @@ out: return res; } -COMMAND(routing_algo, "ra", 0, NULL, +COMMAND(SUBCOMMAND, routing_algo, "ra", 0, NULL, "[mode] \tdisplay or modify the routing algorithm"); diff --git a/statistics.c b/statistics.c index 26ffe44..d684fa5 100644 --- a/statistics.c +++ b/statistics.c @@ -126,5 +126,5 @@ out: return ret; } -COMMAND(statistics, "s", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND, statistics, "s", COMMAND_FLAG_MESH_IFACE, NULL, " \tprint mesh statistics"); diff --git a/tcpdump.c b/tcpdump.c index 5c93842..42713d3 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1352,5 +1352,5 @@ out: return ret; } -COMMAND(tcpdump, "td", 0, NULL, +COMMAND(SUBCOMMAND, tcpdump, "td", 0, NULL, "<interface> \ttcpdump layer 2 traffic on the given interface"); diff --git a/throughputmeter.c b/throughputmeter.c index 0c5e38a..de20b66 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -543,5 +543,5 @@ out: return ret; } -COMMAND(throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND, throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \tstart a throughput measurement"); diff --git a/traceroute.c b/traceroute.c index 77c3188..6e325c4 100644 --- a/traceroute.c +++ b/traceroute.c @@ -231,5 +231,5 @@ out: return ret; } -COMMAND(traceroute, "tr", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND, traceroute, "tr", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \ttraceroute another batman adv host via layer 2"); diff --git a/translate.c b/translate.c index 38f26df..ad51ddf 100644 --- a/translate.c +++ b/translate.c @@ -78,5 +78,5 @@ out: return ret; } -COMMAND(translate, "t", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND, translate, "t", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \ttranslate a destination to the originator responsible for it");

1 0

[batctl] master: batctl: Move dat_cache debug table to own file (c7139b5)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit c7139b57465dcd553118df1be7e284897f5f64fa Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:23 2018 +0200 batctl: Move dat_cache debug table to own file 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(a)narfation.org> >--------------------------------------------------------------- c7139b57465dcd553118df1be7e284897f5f64fa Makefile | 1 + claimtable.c | 4 +- dat_cache.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ debug.c | 9 ---- netlink.c | 96 --------------------------------------- netlink.h | 2 - 6 files changed, 148 insertions(+), 110 deletions(-) diff --git a/Makefile b/Makefile index cdc5948..648c7bc 100755 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ ifeq ($(CONFIG_BATCTL_BISECT),y) OBJ += $(OBJ_BISECT) endif OBJ += claimtable.o +OBJ += dat_cache.o OBJ += debugfs.o OBJ += debug.o OBJ += functions.o diff --git a/claimtable.c b/claimtable.c index 06473d0..06f42dc 100644 --- a/claimtable.c +++ b/claimtable.c @@ -1,9 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * - * Andrew Lunn <andrew(a)lunn.ch> - * Simon Wunderlich <sw(a)simonwunderlich.de> - * Sven Eckelmann <sven(a)narfation.org> + * Linus Lüssing <linus.luessing(a)c0d3.blue> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/dat_cache.c b/dat_cache.c new file mode 100644 index 0000000..a56fb11 --- /dev/null +++ b/dat_cache.c @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)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 <arpa/inet.h> +#include <netinet/if_ether.h> +#include <netinet/in.h> +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <sys/socket.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 dat_cache_mandatory[] = { + BATADV_ATTR_DAT_CACHE_IP4ADDRESS, + BATADV_ATTR_DAT_CACHE_HWADDRESS, + BATADV_ATTR_DAT_CACHE_VID, + BATADV_ATTR_LAST_SEEN_MSECS, +}; + +static int dat_cache_callback(struct nl_msg *msg, void *arg) +{ + int last_seen_msecs, last_seen_secs, last_seen_mins; + 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; + struct in_addr in_addr; + uint8_t *hwaddr; + int16_t vid; + char *addr; + + 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_DAT_CACHE) + 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, dat_cache_mandatory, + ARRAY_SIZE(dat_cache_mandatory))) { + fputs("Missing attributes from kernel\n", stderr); + exit(1); + } + + in_addr.s_addr = nla_get_u32(attrs[BATADV_ATTR_DAT_CACHE_IP4ADDRESS]); + addr = inet_ntoa(in_addr); + hwaddr = nla_data(attrs[BATADV_ATTR_DAT_CACHE_HWADDRESS]); + vid = nla_get_u16(attrs[BATADV_ATTR_DAT_CACHE_VID]); + + last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); + last_seen_mins = last_seen_msecs / 60000; + last_seen_msecs = last_seen_msecs % 60000; + last_seen_secs = last_seen_msecs / 1000; + + if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01)) + return NL_OK; + + if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01)) + return NL_OK; + + printf(" * %15s ", addr); + + bat_host = bat_hosts_find_by_mac((char *)hwaddr); + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + hwaddr[0], hwaddr[1], hwaddr[2], + hwaddr[3], hwaddr[4], hwaddr[5]); + else + printf("%17s ", bat_host->name); + + printf("%4i %6i:%02i\n", + BATADV_PRINT_VID(vid), last_seen_mins, last_seen_secs); + + return NL_OK; +} + +static int netlink_print_dat_cache(char *mesh_iface, char *orig_iface, + int read_opts, float orig_timeout, + float watch_interval) +{ + char *header; + int ret; + + ret = asprintf(&header, "Distributed ARP Table (%s):\n%s\n", + mesh_iface, + " IPv4 MAC VID last-seen"); + + if (ret < 0) + return ret; + + ret = netlink_print_common(mesh_iface, orig_iface, read_opts, + orig_timeout, watch_interval, header, + BATADV_CMD_GET_DAT_CACHE, + dat_cache_callback); + + free(header); + return ret; +} + +static struct debug_table_data batctl_debug_table_dat_cache = { + .debugfs_name = DEBUG_DAT_CACHE, + .header_lines = 2, + .netlink_fn = netlink_print_dat_cache, +}; + +COMMAND_NAMED(DEBUGTABLE, dat_cache, "dc", handle_debug_table, + COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_dat_cache, ""); diff --git a/debug.c b/debug.c index c8a2845..29c8252 100644 --- a/debug.c +++ b/debug.c @@ -251,15 +251,6 @@ static struct debug_table_data batctl_debug_table_transglobal = { COMMAND_NAMED(DEBUGTABLE, transglobal, "tg", handle_debug_table, COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_transglobal, ""); -static struct debug_table_data batctl_debug_table_dat_cache = { - .debugfs_name = DEBUG_DAT_CACHE, - .header_lines = 2, - .netlink_fn = netlink_print_dat_cache, -}; - -COMMAND_NAMED(DEBUGTABLE, dat_cache, "dc", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_dat_cache, ""); - static struct debug_table_data batctl_debug_table_nc_nodes = { .debugfs_name = DEBUG_NC_NODES, .header_lines = 0, diff --git a/netlink.c b/netlink.c index 4d3c6f8..42fe4a0 100644 --- a/netlink.c +++ b/netlink.c @@ -964,80 +964,6 @@ static int gateways_callback(struct nl_msg *msg, void *arg) return NL_OK; } -static const int dat_cache_mandatory[] = { - BATADV_ATTR_DAT_CACHE_IP4ADDRESS, - BATADV_ATTR_DAT_CACHE_HWADDRESS, - BATADV_ATTR_DAT_CACHE_VID, - BATADV_ATTR_LAST_SEEN_MSECS, -}; - -static int dat_cache_callback(struct nl_msg *msg, void *arg) -{ - int last_seen_msecs, last_seen_secs, last_seen_mins; - 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; - struct in_addr in_addr; - uint8_t *hwaddr; - int16_t vid; - char *addr; - - 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_DAT_CACHE) - 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, dat_cache_mandatory, - ARRAY_SIZE(dat_cache_mandatory))) { - fputs("Missing attributes from kernel\n", stderr); - exit(1); - } - - in_addr.s_addr = nla_get_u32(attrs[BATADV_ATTR_DAT_CACHE_IP4ADDRESS]); - addr = inet_ntoa(in_addr); - hwaddr = nla_data(attrs[BATADV_ATTR_DAT_CACHE_HWADDRESS]); - vid = nla_get_u16(attrs[BATADV_ATTR_DAT_CACHE_VID]); - - last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); - last_seen_mins = last_seen_msecs / 60000; - last_seen_msecs = last_seen_msecs % 60000; - last_seen_secs = last_seen_msecs / 1000; - - if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01)) - return NL_OK; - - if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01)) - return NL_OK; - - printf(" * %15s ", addr); - - bat_host = bat_hosts_find_by_mac((char *)hwaddr); - if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) - printf("%02x:%02x:%02x:%02x:%02x:%02x ", - hwaddr[0], hwaddr[1], hwaddr[2], - hwaddr[3], hwaddr[4], hwaddr[5]); - else - printf("%17s ", bat_host->name); - - printf("%4i %6i:%02i\n", - BATADV_PRINT_VID(vid), last_seen_mins, last_seen_secs); - - return NL_OK; -} - static const int mcast_flags_mandatory[] = { BATADV_ATTR_ORIG_ADDRESS, }; @@ -1315,28 +1241,6 @@ int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opts, gateways_callback); } -int netlink_print_dat_cache(char *mesh_iface, char *orig_iface, int read_opts, - float orig_timeout, float watch_interval) -{ - char *header; - int ret; - - ret = asprintf(&header, "Distributed ARP Table (%s):\n%s\n", - mesh_iface, - " IPv4 MAC VID last-seen"); - - if (ret < 0) - return ret; - - ret = netlink_print_common(mesh_iface, orig_iface, read_opts, - orig_timeout, watch_interval, header, - BATADV_CMD_GET_DAT_CACHE, - dat_cache_callback); - - free(header); - return ret; -} - int netlink_print_mcast_flags(char *mesh_iface, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) { diff --git a/netlink.h b/netlink.h index 514dfa3..7549838 100644 --- a/netlink.h +++ b/netlink.h @@ -51,8 +51,6 @@ int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); int netlink_print_gateways(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); -int netlink_print_dat_cache(char *mesh_iface, char *orig_iface, int read_opt, - float orig_timeout, float watch_interval); int netlink_print_mcast_flags(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval);

1 0

[batctl] master: batctl: Move neighbors debug table to own file (cb11a0c)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit cb11a0c8af1b3ceb0660981188339b9067c5502e Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:27 2018 +0200 batctl: Move neighbors debug table to own file 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(a)narfation.org> >--------------------------------------------------------------- cb11a0c8af1b3ceb0660981188339b9067c5502e Makefile | 1 + debug.c | 9 ---- backbonetable.c => neighbors.c | 96 ++++++++++++++++++++++++------------------ netlink.c | 94 ----------------------------------------- netlink.h | 2 - 5 files changed, 57 insertions(+), 145 deletions(-) diff --git a/Makefile b/Makefile index ac4824b..d447663 100755 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ OBJ += log.o OBJ += main.o OBJ += mcast_flags.o OBJ += nc_nodes.o +OBJ += neighbors.o OBJ += netlink.o OBJ += ping.o OBJ += routing_algo.o diff --git a/debug.c b/debug.c index 531c6aa..a5e7276 100644 --- a/debug.c +++ b/debug.c @@ -200,15 +200,6 @@ int debug_print_routing_algos(void) return read_file(full_path, DEBUG_ROUTING_ALGOS, 0, 0, 0, 0); } -static struct debug_table_data batctl_debug_table_neighbors = { - .debugfs_name = "neighbors", - .header_lines = 2, - .netlink_fn = netlink_print_neighbors, -}; - -COMMAND_NAMED(DEBUGTABLE, neighbors, "n", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_neighbors, ""); - static struct debug_table_data batctl_debug_table_originators = { .debugfs_name = "originators", .header_lines = 2, diff --git a/backbonetable.c b/neighbors.c similarity index 50% copy from backbonetable.c copy to neighbors.c index d2e58d1..f7ea9ec 100644 --- a/backbonetable.c +++ b/neighbors.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * - * Simon Wunderlich <sw(a)simonwunderlich.de> + * Andrew Lunn <andrew(a)lunn.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 @@ -20,6 +20,7 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ +#include <net/if.h> #include <netinet/if_ether.h> #include <netlink/netlink.h> #include <netlink/genl/genl.h> @@ -36,24 +37,23 @@ #include "main.h" #include "netlink.h" -static const int bla_backbone_mandatory[] = { - BATADV_ATTR_BLA_VID, - BATADV_ATTR_BLA_BACKBONE, - BATADV_ATTR_BLA_CRC, +static const int neighbors_mandatory[] = { + BATADV_ATTR_NEIGH_ADDRESS, + BATADV_ATTR_HARD_IFINDEX, BATADV_ATTR_LAST_SEEN_MSECS, }; -static int bla_backbone_callback(struct nl_msg *msg, void *arg) +static int neighbors_callback(struct nl_msg *msg, void *arg) { + unsigned throughput_mbits, throughput_kbits; struct nlattr *attrs[BATADV_ATTR_MAX+1]; struct nlmsghdr *nlh = nlmsg_hdr(msg); int last_seen_msecs, last_seen_secs; struct print_opts *opts = arg; struct bat_host *bat_host; + char ifname[IF_NAMESIZE]; struct genlmsghdr *ghdr; - uint16_t backbone_crc; - uint8_t *backbone; - uint16_t vid; + uint8_t *neigh; if (!genlmsg_valid_hdr(nlh, 0)) { fputs("Received invalid data from kernel.\n", stderr); @@ -62,7 +62,7 @@ static int bla_backbone_callback(struct nl_msg *msg, void *arg) ghdr = nlmsg_data(nlh); - if (ghdr->cmd != BATADV_CMD_GET_BLA_BACKBONE) + if (ghdr->cmd != BATADV_CMD_GET_NEIGHBORS) return NL_OK; if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), @@ -71,55 +71,71 @@ static int bla_backbone_callback(struct nl_msg *msg, void *arg) exit(1); } - if (missing_mandatory_attrs(attrs, bla_backbone_mandatory, - ARRAY_SIZE(bla_backbone_mandatory))) { + if (missing_mandatory_attrs(attrs, neighbors_mandatory, + ARRAY_SIZE(neighbors_mandatory))) { fputs("Missing attributes from kernel\n", stderr); exit(1); } - /* don't show own backbones */ - if (attrs[BATADV_ATTR_BLA_OWN]) - return NL_OK; + neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); + bat_host = bat_hosts_find_by_mac((char *)neigh); - vid = nla_get_u16(attrs[BATADV_ATTR_BLA_VID]); - backbone = nla_data(attrs[BATADV_ATTR_BLA_BACKBONE]); - backbone_crc = nla_get_u16(attrs[BATADV_ATTR_BLA_CRC]); + if (!if_indextoname(nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]), + ifname)) + ifname[0] = '\0'; last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); last_seen_secs = last_seen_msecs / 1000; last_seen_msecs = last_seen_msecs % 1000; - bat_host = bat_hosts_find_by_mac((char *)backbone); - if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) - printf("%02x:%02x:%02x:%02x:%02x:%02x ", - backbone[0], backbone[1], backbone[2], - backbone[3], backbone[4], backbone[5]); - else - printf("%17s ", bat_host->name); - - printf("on %5d %4i.%03is (0x%04x)\n", - BATADV_PRINT_VID(vid), last_seen_secs, last_seen_msecs, - backbone_crc); + if (attrs[BATADV_ATTR_THROUGHPUT]) { + throughput_kbits = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT]); + throughput_mbits = throughput_kbits / 1000; + throughput_kbits = throughput_kbits % 1000; + + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + neigh[0], neigh[1], neigh[2], + neigh[3], neigh[4], neigh[5]); + else + printf("%17s ", bat_host->name); + + printf("%4i.%03is (%9u.%1u) [%10s]\n", + last_seen_secs, last_seen_msecs, + throughput_mbits, throughput_kbits / 100, + ifname); + } else { + printf(" %10s ", ifname); + + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + neigh[0], neigh[1], neigh[2], + neigh[3], neigh[4], neigh[5]); + else + printf("%17s ", bat_host->name); + + printf("%4i.%03is\n", last_seen_secs, last_seen_msecs); + } return NL_OK; } -static int netlink_print_bla_backbone(char *mesh_iface, char *orig_iface, - int read_opts, float orig_timeout, - float watch_interval) +static int netlink_print_neighbors(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, - "Originator VID last seen (CRC )\n", - BATADV_CMD_GET_BLA_BACKBONE, - bla_backbone_callback); + "IF Neighbor last-seen\n", + BATADV_CMD_GET_NEIGHBORS, + neighbors_callback); } -static struct debug_table_data batctl_debug_table_backbonetable = { - .debugfs_name = DEBUG_BACKBONETABLE, +static struct debug_table_data batctl_debug_table_neighbors = { + .debugfs_name = "neighbors", .header_lines = 2, - .netlink_fn = netlink_print_bla_backbone, + .netlink_fn = netlink_print_neighbors, }; -COMMAND_NAMED(DEBUGTABLE, backbonetable, "bbt", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_backbonetable, ""); +COMMAND_NAMED(DEBUGTABLE, neighbors, "n", handle_debug_table, + COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_neighbors, ""); diff --git a/netlink.c b/netlink.c index 4f2199e..7735cb6 100644 --- a/netlink.c +++ b/netlink.c @@ -595,89 +595,6 @@ static int originators_callback(struct nl_msg *msg, void *arg) return NL_OK; } -static const int neighbors_mandatory[] = { - BATADV_ATTR_NEIGH_ADDRESS, - BATADV_ATTR_HARD_IFINDEX, - BATADV_ATTR_LAST_SEEN_MSECS, -}; - -static int neighbors_callback(struct nl_msg *msg, void *arg) -{ - unsigned throughput_mbits, throughput_kbits; - struct nlattr *attrs[BATADV_ATTR_MAX+1]; - struct nlmsghdr *nlh = nlmsg_hdr(msg); - int last_seen_msecs, last_seen_secs; - struct print_opts *opts = arg; - struct bat_host *bat_host; - char ifname[IF_NAMESIZE]; - struct genlmsghdr *ghdr; - uint8_t *neigh; - - 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_NEIGHBORS) - 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, neighbors_mandatory, - ARRAY_SIZE(neighbors_mandatory))) { - fputs("Missing attributes from kernel\n", stderr); - exit(1); - } - - neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); - bat_host = bat_hosts_find_by_mac((char *)neigh); - - if (!if_indextoname(nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]), - ifname)) - ifname[0] = '\0'; - - last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); - last_seen_secs = last_seen_msecs / 1000; - last_seen_msecs = last_seen_msecs % 1000; - - if (attrs[BATADV_ATTR_THROUGHPUT]) { - throughput_kbits = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT]); - throughput_mbits = throughput_kbits / 1000; - throughput_kbits = throughput_kbits % 1000; - - if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) - printf("%02x:%02x:%02x:%02x:%02x:%02x ", - neigh[0], neigh[1], neigh[2], - neigh[3], neigh[4], neigh[5]); - else - printf("%17s ", bat_host->name); - - printf("%4i.%03is (%9u.%1u) [%10s]\n", - last_seen_secs, last_seen_msecs, - throughput_mbits, throughput_kbits / 100, - ifname); - } else { - printf(" %10s ", ifname); - - if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) - printf("%02x:%02x:%02x:%02x:%02x:%02x ", - neigh[0], neigh[1], neigh[2], - neigh[3], neigh[4], neigh[5]); - else - printf("%17s ", bat_host->name); - - printf("%4i.%03is\n", last_seen_secs, last_seen_msecs); - } - - return NL_OK; -} - static const int transglobal_mandatory[] = { BATADV_ATTR_TT_ADDRESS, BATADV_ATTR_ORIG_ADDRESS, @@ -1018,17 +935,6 @@ int netlink_print_originators(char *mesh_iface, char *orig_iface, originators_callback); } -int netlink_print_neighbors(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, - "IF Neighbor last-seen\n", - BATADV_CMD_GET_NEIGHBORS, - neighbors_callback); -} - int netlink_print_transglobal(char *mesh_iface, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) diff --git a/netlink.h b/netlink.h index e0fa466..bfac3a5 100644 --- a/netlink.h +++ b/netlink.h @@ -42,8 +42,6 @@ struct ether_addr; int netlink_print_routing_algos(void); int netlink_print_originators(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); -int netlink_print_neighbors(char *mesh_iface, char *orig_iface, int read_opt, - float orig_timeout, float watch_interval); 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,

1 0

[batctl] master: batctl: Move transglobal debug table to own file (06b5a37)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 06b5a37295b6072a7b37810f60ff2674e03fa540 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:29 2018 +0200 batctl: Move transglobal debug table to own file 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(a)narfation.org> >--------------------------------------------------------------- 06b5a37295b6072a7b37810f60ff2674e03fa540 Makefile | 1 + debug.c | 11 ---- netlink.c | 112 ---------------------------------------- netlink.h | 2 - transglobal.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 125 deletions(-) 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 @@ err_free_sock: 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 @@ err_free_sock: 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..f61aa9f --- /dev/null +++ b/transglobal.c @@ -0,0 +1,161 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: + * + * Andrew Lunn <andrew(a)lunn.ch> + * Sven Eckelmann <sven(a)narfation.org> + * + * 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 <netinet/if_ether.h> +#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, "");

1 0

[batctl] master: batctl: Move nc_nodes debug table to own file (0b56f89)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0b56f895587027fa2643e6be088fa65bb30785b0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:26 2018 +0200 batctl: Move nc_nodes debug table to own file The other commands are stored in separate files and nc_nodes might also receive a netlink implementation. The latter would increase the complexity significantly and thus justify that the command is also added via an extra file. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0b56f895587027fa2643e6be088fa65bb30785b0 Makefile | 1 + debug.c | 8 -------- allocate.h => nc_nodes.c | 20 +++++++++----------- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index a725986..ac4824b 100755 --- a/Makefile +++ b/Makefile @@ -49,6 +49,7 @@ OBJ += loglevel.o OBJ += log.o OBJ += main.o OBJ += mcast_flags.o +OBJ += nc_nodes.o OBJ += netlink.o OBJ += ping.o OBJ += routing_algo.o diff --git a/debug.c b/debug.c index 4b480a3..531c6aa 100644 --- a/debug.c +++ b/debug.c @@ -241,11 +241,3 @@ static struct debug_table_data batctl_debug_table_transglobal = { COMMAND_NAMED(DEBUGTABLE, transglobal, "tg", handle_debug_table, COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_transglobal, ""); - -static struct debug_table_data batctl_debug_table_nc_nodes = { - .debugfs_name = DEBUG_NC_NODES, - .header_lines = 0, -}; - -COMMAND_NAMED(DEBUGTABLE, nc_nodes, "nn", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_nc_nodes, ""); diff --git a/allocate.h b/nc_nodes.c similarity index 71% copy from allocate.h copy to nc_nodes.c index cc4c283..9cf437d 100644 --- a/allocate.h +++ b/nc_nodes.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +// SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * * Marek Lindner <mareklindner(a)neomailbox.ch> @@ -20,15 +20,13 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ +#include "debug.h" +#include "main.h" -#ifndef _BATCTL_ALLOCATE_H -#define _BATCTL_ALLOCATE_H +static struct debug_table_data batctl_debug_table_nc_nodes = { + .debugfs_name = DEBUG_NC_NODES, + .header_lines = 0, +}; -/* debug allocate wrapper to keep hash.c happy */ - -#include <stdlib.h> - -#define debugMalloc(length, tag) malloc(length) -#define debugFree(mem, tag) free(mem) - -#endif +COMMAND_NAMED(DEBUGTABLE, nc_nodes, "nn", handle_debug_table, + COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_nc_nodes, "");

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2018