commits November 2018

commits@lists.open-mesh.org

1 participants
87 discussions

[batctl] master: batctl: Use getopt to parse main options (f1d60f0)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit f1d60f0019e4c41fad1d00fc7e79aff6fd9c01c0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:15 2018 +0200 batctl: Use getopt to parse main options The handwritten option parser is rather fragile and doesn't support all features of a normal commandline option parser. Instead use getopt to handle the most critical parts and keep it more flexible. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- f1d60f0019e4c41fad1d00fc7e79aff6fd9c01c0 main.c | 95 +++++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/main.c b/main.c index fa4371c..f5df477 100644 --- a/main.c +++ b/main.c @@ -22,6 +22,7 @@ +#include <getopt.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -87,6 +88,25 @@ static void print_usage(void) #endif } +static void version(void) +{ + int ret; + + printf("batctl %s [batman-adv: ", SOURCE_VERSION); + + ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); + if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (ret == EXIT_SUCCESS) + printf("%s]\n", line_ptr); + else + printf("module not loaded]\n"); + + free(line_ptr); + exit(EXIT_SUCCESS); +} + static const struct command *find_command(const char *name) { const struct command **p; @@ -109,53 +129,48 @@ int main(int argc, char **argv) const struct command *cmd; int i, ret = EXIT_FAILURE; char *mesh_iface = mesh_dfl_iface; - - if ((argc > 1) && (strcmp(argv[1], "-m") == 0)) { - if (argc < 3) { - fprintf(stderr, "Error - the option '-m' needs a parameter\n"); + int opt; + + while ((opt = getopt(argc, argv, "+hm:v")) != -1) { + switch (opt) { + case 'h': + print_usage(); + exit(EXIT_SUCCESS); + break; + case 'm': + if (mesh_iface != mesh_dfl_iface) { + fprintf(stderr, + "Error - multiple mesh interfaces specified\n"); + goto err; + } + + mesh_iface = argv[2]; + break; + case 'v': + version(); + break; + default: goto err; } - - mesh_iface = argv[2]; - - argv += 2; - argc -= 2; } - if (argc < 2) { + if (optind >= argc) { fprintf(stderr, "Error - no command specified\n"); goto err; } - if (strcmp(argv[1], "-h") == 0) { - print_usage(); - exit(EXIT_SUCCESS); - } - - if (strcmp(argv[1], "-v") == 0) { - printf("batctl %s [batman-adv: ", SOURCE_VERSION); - - ret = read_file("", module_ver_path, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); - if ((line_ptr) && (line_ptr[strlen(line_ptr) - 1] == '\n')) - line_ptr[strlen(line_ptr) - 1] = '\0'; - - if (ret == EXIT_SUCCESS) - printf("%s]\n", line_ptr); - else - printf("module not loaded]\n"); - - free(line_ptr); - exit(EXIT_SUCCESS); - } + argv += optind; + argc -= optind; + optind = 0; - if ((cmd = find_command(argv[1]))) { + if ((cmd = find_command(argv[0]))) { 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); exit(EXIT_FAILURE); } - ret = cmd->handler(mesh_iface, argc - 1, argv + 1); + ret = cmd->handler(mesh_iface, 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); @@ -163,24 +178,26 @@ int main(int argc, char **argv) } for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { - if ((strcmp(argv[1], batctl_settings[i].opt_long) != 0) && - (strcmp(argv[1], batctl_settings[i].opt_short) != 0)) + if ((strcmp(argv[0], batctl_settings[i].opt_long) != 0) && + (strcmp(argv[0], batctl_settings[i].opt_short) != 0)) continue; - ret = handle_sys_setting(mesh_iface, i, argc - 1, argv + 1); + ret = handle_sys_setting(mesh_iface, i, argc, argv); goto out; } for (i = 0; i < BATCTL_TABLE_NUM; i++) { - if ((strcmp(argv[1], batctl_debug_tables[i].opt_long) != 0) && - (strcmp(argv[1], batctl_debug_tables[i].opt_short) != 0)) + if ((strcmp(argv[0], batctl_debug_tables[i].opt_long) != 0) && + (strcmp(argv[0], batctl_debug_tables[i].opt_short) != 0)) continue; - ret = handle_debug_table(mesh_iface, i, argc - 1, argv + 1); + ret = handle_debug_table(mesh_iface, i, argc, argv); goto out; } - fprintf(stderr, "Error - no valid command or debug table specified: %s\n", argv[1]); + fprintf(stderr, + "Error - no valid command or debug table specified: %s\n", + argv[0]); print_usage(); }

1 0

[batctl] master: batctl: Store usage line next to command (39be061)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 39be061be943801b53499d405632eb3e99b997ae Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:16 2018 +0200 batctl: Store usage line next to command The single line usage information for a subcommand is the simplest way to learn how to use a command. It is displayed when either the -h option is used or when the initial part of the batctl command is incorrect. Since the commands are no longer registered manually in the main function, the usage line should also no longer be stored there. Instead add it to the same file as the command itself. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 39be061be943801b53499d405632eb3e99b997ae Makefile | 13 +++++++------ bisect_iv.c | 3 ++- gw_mode.c | 3 ++- interface.c | 3 ++- log.c | 3 ++- loglevel.c | 3 ++- main.c | 31 +++++++++++++++---------------- main.h | 8 +++++--- ping.c | 3 ++- routing_algo.c | 3 ++- statistics.c | 3 ++- tcpdump.c | 3 ++- throughputmeter.c | 3 ++- traceroute.c | 3 ++- translate.c | 3 ++- 15 files changed, 51 insertions(+), 37 deletions(-) diff --git a/Makefile b/Makefile index b4777b7..842795b 100755 --- a/Makefile +++ b/Makefile @@ -26,7 +26,13 @@ export CONFIG_BATCTL_BISECT=n # batctl build BINARY_NAME = batctl + +OBJ_BISECT = bisect_iv.o + OBJ += bat-hosts.o +ifeq ($(CONFIG_BATCTL_BISECT),y) +OBJ += $(OBJ_BISECT) +endif OBJ += debugfs.o OBJ += debug.o OBJ += functions.o @@ -47,7 +53,7 @@ OBJ += tcpdump.o OBJ += throughputmeter.o OBJ += traceroute.o OBJ += translate.o -OBJ_BISECT = bisect_iv.o + MANPAGE = man/batctl.8 # batctl flags and options @@ -95,11 +101,6 @@ CFLAGS += $(LIBNL_GENL_CFLAGS) LDLIBS += $(LIBNL_GENL_LDLIBS) # standard build tools -ifeq ($(CONFIG_BATCTL_BISECT),y) -OBJ += $(OBJ_BISECT) -CPPFLAGS += -DBATCTL_BISECT -endif - CC ?= gcc RM ?= rm -f INSTALL ?= install diff --git a/bisect_iv.c b/bisect_iv.c index f87f915..6da82b9 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1595,4 +1595,5 @@ err: return ret; } -COMMAND(bisect_iv, "bisect_iv", 0); +COMMAND(bisect_iv, "bisect_iv", 0, + "<file1> .. <fileN>\tanalyze given batman iv log files for routing stability"); diff --git a/gw_mode.c b/gw_mode.c index f07dc99..da22ff0 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -167,4 +167,5 @@ out: return res; } -COMMAND(gw_mode, "gw", COMMAND_FLAG_MESH_IFACE); +COMMAND(gw_mode, "gw", COMMAND_FLAG_MESH_IFACE, + "[mode] \tdisplay or modify the gateway mode"); diff --git a/interface.c b/interface.c index 485ed0a..d2883a9 100644 --- a/interface.c +++ b/interface.c @@ -458,4 +458,5 @@ err: return EXIT_FAILURE; } -COMMAND(interface, "if", 0); +COMMAND(interface, "if", 0, + "[add|del iface(s)]\tdisplay or modify the interface settings"); diff --git a/log.c b/log.c index 585f1c9..e28466d 100644 --- a/log.c +++ b/log.c @@ -69,4 +69,5 @@ static int log_print(char *mesh_iface, int argc, char **argv) return res; } -COMMAND_NAMED(log, "l", log_print, COMMAND_FLAG_MESH_IFACE); +COMMAND_NAMED(log, "l", log_print, COMMAND_FLAG_MESH_IFACE, + " \tread the log produced by the kernel module"); diff --git a/loglevel.c b/loglevel.c index 06519e7..3dc1a1c 100644 --- a/loglevel.c +++ b/loglevel.c @@ -143,4 +143,5 @@ out: return res; } -COMMAND(loglevel, "ll", COMMAND_FLAG_MESH_IFACE); +COMMAND(loglevel, "ll", COMMAND_FLAG_MESH_IFACE, + "[level] \tdisplay or modify the log level"); diff --git a/main.c b/main.c index f5df477..b9b19de 100644 --- a/main.c +++ b/main.c @@ -41,7 +41,9 @@ extern const struct command *__stop___command[]; static void print_usage(void) { + const struct command **p; int i, opt_indent; + char buf[32]; fprintf(stderr, "Usage: batctl [options] command|debug table [parameters]\n"); fprintf(stderr, "options:\n"); @@ -51,7 +53,19 @@ static void print_usage(void) fprintf(stderr, "\n"); fprintf(stderr, "commands:\n"); - fprintf(stderr, " \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); + + for (p = __start___command; p < __stop___command; p++) { + const struct command *cmd = *p; + + 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); @@ -66,26 +80,11 @@ static void print_usage(void) fprintf(stderr, " display or modify %s setting\n", batctl_settings[i].opt_long); } - fprintf(stderr, " \tloglevel|ll [level] \tdisplay or modify the log level\n"); - fprintf(stderr, " \tlog|l \tread the log produced by the kernel module\n"); - fprintf(stderr, " \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); - fprintf(stderr, " \trouting_algo|ra [mode] \tdisplay or modify the routing algorithm\n"); fprintf(stderr, "\n"); fprintf(stderr, "debug tables: \tdisplay the corresponding debug table\n"); for (i = 0; i < BATCTL_TABLE_NUM; i++) fprintf(stderr, " \t%s|%s\n", batctl_debug_tables[i].opt_long, batctl_debug_tables[i].opt_short); - - fprintf(stderr, "\n"); - fprintf(stderr, " \tstatistics|s \tprint mesh statistics\n"); - fprintf(stderr, " \tping|p <destination> \tping another batman adv host via layer 2\n"); - fprintf(stderr, " \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); - fprintf(stderr, " \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); - printf(" \tthroughputmeter|tp <destination> \tstart a throughput measurement\n"); - fprintf(stderr, " \ttranslate|t <destination> \ttranslate a destination to the originator responsible for it\n"); -#ifdef BATCTL_BISECT - fprintf(stderr, " \tbisect_iv <file1> .. <fileN>\tanalyze given batman iv log files for routing stability\n"); -#endif } static void version(void) diff --git a/main.h b/main.h index c461d6b..b39e350 100644 --- a/main.h +++ b/main.h @@ -66,19 +66,21 @@ struct command { const char *abbr; int (*handler)(char *mesh_iface, int argc, char **argv); uint32_t flags; + const char *usage; }; -#define COMMAND_NAMED(_name, _abbr, _handler, _flags) \ +#define COMMAND_NAMED(_name, _abbr, _handler, _flags, _usage) \ static const struct command command_ ## _name = { \ .name = (#_name), \ .abbr = _abbr, \ .handler = (_handler), \ .flags = (_flags), \ + .usage = (_usage), \ }; \ static const struct command *__command_ ## _name \ __attribute__((__used__)) __attribute__ ((__section__ ("__command"))) = &command_ ## _name -#define COMMAND(_handler, _abbr, _flags) \ - COMMAND_NAMED(_handler, _abbr, _handler, _flags) +#define COMMAND(_handler, _abbr, _flags, _usage) \ + COMMAND_NAMED(_handler, _abbr, _handler, _flags, _usage) #endif diff --git a/ping.c b/ping.c index 2da49d4..efaf011 100644 --- a/ping.c +++ b/ping.c @@ -345,4 +345,5 @@ out: return ret; } -COMMAND(ping, "p", COMMAND_FLAG_MESH_IFACE); +COMMAND(ping, "p", COMMAND_FLAG_MESH_IFACE, + "<destination> \tping another batman adv host via layer 2"); diff --git a/routing_algo.c b/routing_algo.c index 2026224..8cc4ff1 100644 --- a/routing_algo.c +++ b/routing_algo.c @@ -126,4 +126,5 @@ out: return res; } -COMMAND(routing_algo, "ra", 0); +COMMAND(routing_algo, "ra", 0, + "[mode] \tdisplay or modify the routing algorithm"); diff --git a/statistics.c b/statistics.c index cb6c1e8..908bbaf 100644 --- a/statistics.c +++ b/statistics.c @@ -126,4 +126,5 @@ out: return ret; } -COMMAND(statistics, "s", COMMAND_FLAG_MESH_IFACE); +COMMAND(statistics, "s", COMMAND_FLAG_MESH_IFACE, + " \tprint mesh statistics"); diff --git a/tcpdump.c b/tcpdump.c index fd2b35a..62e4a64 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1352,4 +1352,5 @@ out: return ret; } -COMMAND(tcpdump, "td", 0); +COMMAND(tcpdump, "td", 0, + "<interface> \ttcpdump layer 2 traffic on the given interface"); diff --git a/throughputmeter.c b/throughputmeter.c index e9e318c..ebd35a6 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -543,4 +543,5 @@ out: return ret; } -COMMAND(throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE); +COMMAND(throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, + "<destination> \tstart a throughput measurement"); diff --git a/traceroute.c b/traceroute.c index 1352201..9446bcd 100644 --- a/traceroute.c +++ b/traceroute.c @@ -231,4 +231,5 @@ out: return ret; } -COMMAND(traceroute, "tr", COMMAND_FLAG_MESH_IFACE); +COMMAND(traceroute, "tr", COMMAND_FLAG_MESH_IFACE, + "<destination> \ttraceroute another batman adv host via layer 2"); diff --git a/translate.c b/translate.c index d2d34f5..95de9a2 100644 --- a/translate.c +++ b/translate.c @@ -78,4 +78,5 @@ out: return ret; } -COMMAND(translate, "t", COMMAND_FLAG_MESH_IFACE); +COMMAND(translate, "t", COMMAND_FLAG_MESH_IFACE, + "<destination> \ttranslate a destination to the originator responsible for it");

1 0

[batctl] master: batctl: Use command structure for remaining subcommands (e5ccd20)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit e5ccd20106e2e42e43a7ab3d8e7801a13cdda9f7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:14 2018 +0200 batctl: Use command structure for remaining subcommands The command datastructure was extended to be usable for mesh_iface and non-mesh_iface subcommands. The referenced subcommands only have to use the same function signature to work correctly. The introduction of dummy parameter to the functions allows therefore to convert all non-settings and non-debug-tables subcommands to the new infrastructure. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e5ccd20106e2e42e43a7ab3d8e7801a13cdda9f7 bisect_iv.c | 5 ++++- bisect_iv.h | 4 ---- interface.c | 6 +++--- interface.h | 30 ------------------------------ main.c | 23 +---------------------- routing_algo.c | 4 +++- routing_algo.h | 28 ---------------------------- tcpdump.c | 4 +++- tcpdump.h | 2 -- 9 files changed, 14 insertions(+), 92 deletions(-) diff --git a/bisect_iv.c b/bisect_iv.c index d71ceda..f87f915 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -32,6 +32,7 @@ #include "bisect_iv.h" #include "bat-hosts.h" #include "hash.h" +#include "main.h" #include "functions.h" static struct hashtable_t *node_hash = NULL; @@ -1440,7 +1441,7 @@ err: return 0; } -int bisect_iv(int argc, char **argv) +static int bisect_iv(char *mesh_iface __maybe_unused, int argc, char **argv) { int ret = EXIT_FAILURE, res, optchar, found_args = 1; int read_opt = USE_BAT_HOSTS, num_parsed_files; @@ -1593,3 +1594,5 @@ err: bat_hosts_free(); return ret; } + +COMMAND(bisect_iv, "bisect_iv", 0); diff --git a/bisect_iv.h b/bisect_iv.h index 7932c2f..5f5200c 100644 --- a/bisect_iv.h +++ b/bisect_iv.h @@ -33,10 +33,6 @@ #define RT_FLAG_UPDATE 2 #define RT_FLAG_DELETE 3 -int bisect_iv(int argc, char **argv); - - - struct bat_node { char name[NAME_LEN]; struct list_head orig_event_list; diff --git a/interface.c b/interface.c index 5951b47..485ed0a 100644 --- a/interface.c +++ b/interface.c @@ -20,8 +20,6 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ -#include "interface.h" - #include <unistd.h> #include <stdio.h> #include <stdbool.h> @@ -299,7 +297,7 @@ err_free_msg: return err; } -int interface(char *mesh_iface, int argc, char **argv) +static int interface(char *mesh_iface, int argc, char **argv) { int i, optchar; int ret; @@ -459,3 +457,5 @@ int interface(char *mesh_iface, int argc, char **argv) err: return EXIT_FAILURE; } + +COMMAND(interface, "if", 0); diff --git a/interface.h b/interface.h deleted file mode 100644 index 83ca129..0000000 --- a/interface.h +++ /dev/null @@ -1,30 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_INTERFACE_H -#define _BATCTL_INTERFACE_H - -#include "main.h" - -int interface(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/main.c b/main.c index dacfb12..fa4371c 100644 --- a/main.c +++ b/main.c @@ -30,10 +30,6 @@ #include "main.h" #include "sys.h" #include "debug.h" -#include "interface.h" -#include "tcpdump.h" -#include "bisect_iv.h" -#include "routing_algo.h" #include "functions.h" char mesh_dfl_iface[] = "bat0"; @@ -152,24 +148,7 @@ int main(int argc, char **argv) exit(EXIT_SUCCESS); } - if ((strcmp(argv[1], "interface") == 0) || (strcmp(argv[1], "if") == 0)) { - - ret = interface(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "tcpdump") == 0) || (strcmp(argv[1], "td") == 0)) { - - ret = tcpdump(argc - 1, argv + 1); - -#ifdef BATCTL_BISECT - } else if ((strcmp(argv[1], "bisect_iv") == 0)) { - - ret = bisect_iv(argc - 1, argv + 1); -#endif - } else if ((strcmp(argv[1], "routing_algo") == 0) || (strcmp(argv[1], "ra") == 0)) { - - ret = routing_algo(mesh_iface, argc - 1, argv + 1); - - } else if ((cmd = find_command(argv[1]))) { + if ((cmd = find_command(argv[1]))) { 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); diff --git a/routing_algo.c b/routing_algo.c index 89af6c5..2026224 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"); } -int routing_algo(char *mesh_iface __maybe_unused, int argc, char **argv) +static int routing_algo(char *mesh_iface __maybe_unused, int argc, char **argv) { DIR *iface_base_dir; struct dirent *iface_dir; @@ -125,3 +125,5 @@ free_buff: out: return res; } + +COMMAND(routing_algo, "ra", 0); diff --git a/routing_algo.h b/routing_algo.h deleted file mode 100644 index db246c6..0000000 --- a/routing_algo.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_ROUTING_ALGO_H -#define _BATCTL_ROUTING_ALGO_H - -int routing_algo(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/tcpdump.c b/tcpdump.c index dc4ccd3..fd2b35a 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -1210,7 +1210,7 @@ static void sig_handler(int sig) } } -int tcpdump(int argc, char **argv) +static int tcpdump(char *mesh_iface __maybe_unused, int argc, char **argv) { struct timeval tv; struct dump_if *dump_if, *dump_if_tmp; @@ -1351,3 +1351,5 @@ out: bat_hosts_free(); return ret; } + +COMMAND(tcpdump, "td", 0); diff --git a/tcpdump.h b/tcpdump.h index f73211b..db92fce 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -113,6 +113,4 @@ struct prism_header { #define PRISM_HEADER_LEN sizeof(struct prism_header) #define RADIOTAP_HEADER_LEN sizeof(struct radiotap_header) -int tcpdump(int argc, char **argv); - #endif

1 0

[batctl] master: batctl: Introduce datastructure for subcommands (8a4e0cd)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 8a4e0cd494df95b76e21b0beaa99948e33f13cf0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:12 2018 +0200 batctl: Introduce datastructure for subcommands The registration of more complex subcommands in batctl required a lot of extra code to get it integrated in the main routine. This lead to a hard to read main function which switches between the subcommand which performs an action. The command structure allows us to provide an simpler way to insert functionality. It currently only works for complete separated commands which operates on already existing batman-adv interface. But it is flexible enough to later also support the rest of the commands. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8a4e0cd494df95b76e21b0beaa99948e33f13cf0 gw_mode.c | 4 +++- gw_mode.h | 28 ------------------------- log.c | 4 +++- log.h | 28 ------------------------- loglevel.c | 4 +++- loglevel.h | 28 ------------------------- main.c | 63 ++++++++++++++++++++----------------------------------- main.h | 18 ++++++++++++++++ ping.c | 5 +++-- ping.h | 28 ------------------------- statistics.c | 7 ++++--- statistics.h | 28 ------------------------- throughputmeter.c | 5 +++-- throughputmeter.h | 28 ------------------------- traceroute.c | 5 +++-- traceroute.h | 28 ------------------------- translate.c | 5 +++-- translate.h | 28 ------------------------- 18 files changed, 66 insertions(+), 278 deletions(-) diff --git a/gw_mode.c b/gw_mode.c index a92644e..884f38e 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"); } -int gw_mode(char *mesh_iface, int argc, char **argv) +static int gw_mode(char *mesh_iface, int argc, char **argv) { int optchar, res = EXIT_FAILURE; char *path_buff, gw_mode; @@ -166,3 +166,5 @@ out: free(path_buff); return res; } + +COMMAND(gw_mode, "gw"); diff --git a/gw_mode.h b/gw_mode.h deleted file mode 100644 index d4d3fb5..0000000 --- a/gw_mode.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_GW_MODE_H -#define _BATCTL_GW_MODE_H - -int gw_mode(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/log.c b/log.c index fc31c66..66594f6 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"); } -int log_print(char *mesh_iface, int argc, char **argv) +static int log_print(char *mesh_iface, int argc, char **argv) { int optchar, res, read_opt = USE_BAT_HOSTS | LOG_MODE; char full_path[MAX_PATH+1]; @@ -68,3 +68,5 @@ int log_print(char *mesh_iface, int argc, char **argv) res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0, 0); return res; } + +COMMAND_NAMED(log, "l", log_print); diff --git a/log.h b/log.h deleted file mode 100644 index 4ba00e3..0000000 --- a/log.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_LOG_H -#define _BATCTL_LOG_H - -int log_print(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/loglevel.c b/loglevel.c index 584cb37..3d9cf3a 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"); } -int loglevel(char *mesh_iface, int argc, char **argv) +static int loglevel(char *mesh_iface, int argc, char **argv) { int optchar, res = EXIT_FAILURE; int log_level = 0; @@ -142,3 +142,5 @@ out: free(path_buff); return res; } + +COMMAND(loglevel, "ll"); diff --git a/loglevel.h b/loglevel.h deleted file mode 100644 index 2644f46..0000000 --- a/loglevel.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_LOGLEVEL_H -#define _BATCTL_LOGLEVEL_H - -int loglevel(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/main.c b/main.c index 34f5a62..14f4774 100644 --- a/main.c +++ b/main.c @@ -31,22 +31,17 @@ #include "sys.h" #include "debug.h" #include "interface.h" -#include "ping.h" -#include "translate.h" -#include "traceroute.h" #include "tcpdump.h" -#include "throughputmeter.h" #include "bisect_iv.h" -#include "statistics.h" -#include "loglevel.h" -#include "log.h" -#include "gw_mode.h" #include "routing_algo.h" #include "functions.h" char mesh_dfl_iface[] = "bat0"; char module_ver_path[] = "/sys/module/batman_adv/version"; +extern const struct command *__start___command[]; +extern const struct command *__stop___command[]; + static void print_usage(void) { int i, opt_indent; @@ -96,8 +91,26 @@ static void print_usage(void) #endif } +static const struct command *find_command(const char *name) +{ + const struct command **p; + + for (p = __start___command; p < __stop___command; p++) { + const struct command *cmd = *p; + + if (strcmp(cmd->name, name) == 0) + return cmd; + + if (strcmp(cmd->abbr, name) == 0) + return cmd; + } + + return NULL; +} + int main(int argc, char **argv) { + const struct command *cmd; int i, ret = EXIT_FAILURE; char *mesh_iface = mesh_dfl_iface; @@ -159,38 +172,8 @@ int main(int argc, char **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); exit(EXIT_FAILURE); - } else if ((strcmp(argv[1], "ping") == 0) || (strcmp(argv[1], "p") == 0)) { - - ret = ping(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "throughputmeter") == 0) || (strcmp(argv[1], "tp") == 0)) { - - ret = throughputmeter(mesh_iface, argc -1, argv + 1); - - } else if ((strcmp(argv[1], "traceroute") == 0) || (strcmp(argv[1], "tr") == 0)) { - - ret = traceroute(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "loglevel") == 0) || (strcmp(argv[1], "ll") == 0)) { - - ret = loglevel(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "log") == 0) || (strcmp(argv[1], "l") == 0)) { - - ret = log_print(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "gw_mode") == 0) || (strcmp(argv[1], "gw") == 0)) { - - ret = gw_mode(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "statistics") == 0) || (strcmp(argv[1], "s") == 0)) { - - ret = statistics(mesh_iface, argc - 1, argv + 1); - - } else if ((strcmp(argv[1], "translate") == 0) || (strcmp(argv[1], "t") == 0)) { - - ret = translate(mesh_iface, argc - 1, argv + 1); - + } else if ((cmd = find_command(argv[1]))) { + ret = cmd->handler(mesh_iface, argc - 1, argv + 1); } else { for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { diff --git a/main.h b/main.h index e8c6db7..f7e2f64 100644 --- a/main.h +++ b/main.h @@ -57,4 +57,22 @@ extern char module_ver_path[]; #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ (int)(vid & VLAN_VID_MASK) : -1) +struct command { + const char *name; + const char *abbr; + int (*handler)(char *mesh_iface, int argc, char **argv); +}; + +#define COMMAND_NAMED(_name, _abbr, _handler) \ + static const struct command command_ ## _name = { \ + .name = (#_name), \ + .abbr = _abbr, \ + .handler = (_handler), \ + }; \ + static const struct command *__command_ ## _name \ + __attribute__((__used__)) __attribute__ ((__section__ ("__command"))) = &command_ ## _name + +#define COMMAND(_handler, _abbr) \ + COMMAND_NAMED(_handler, _abbr, _handler) + #endif diff --git a/ping.c b/ping.c index dc88e22..a4a1851 100644 --- a/ping.c +++ b/ping.c @@ -39,7 +39,6 @@ #include "batadv_packet.h" #include "main.h" -#include "ping.h" #include "functions.h" #include "bat-hosts.h" #include "debugfs.h" @@ -73,7 +72,7 @@ static void sig_handler(int sig) } } -int ping(char *mesh_iface, int argc, char **argv) +static int ping(char *mesh_iface, int argc, char **argv) { struct batadv_icmp_packet_rr icmp_packet_out, icmp_packet_in; struct timeval tv; @@ -345,3 +344,5 @@ out: bat_hosts_free(); return ret; } + +COMMAND(ping, "p"); diff --git a/ping.h b/ping.h deleted file mode 100644 index f09ffb2..0000000 --- a/ping.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_PING_H -#define _BATCTL_PING_H - -int ping(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/statistics.c b/statistics.c index 8a889ca..dea3ac1 100644 --- a/statistics.c +++ b/statistics.c @@ -35,7 +35,6 @@ #include <stdint.h> #include "main.h" -#include "statistics.h" void check_root_or_die(const char *cmd); @@ -103,8 +102,8 @@ out: return ret; } -int statistics(char *mesh_iface, int argc __maybe_unused, - char **argv __maybe_unused) +static int statistics(char *mesh_iface, int argc __maybe_unused, + char **argv __maybe_unused) { struct ifreq ifr; int fd = -1, ret = EXIT_FAILURE; @@ -126,3 +125,5 @@ out: close(fd); return ret; } + +COMMAND(statistics, "s"); diff --git a/statistics.h b/statistics.h deleted file mode 100644 index 3737a48..0000000 --- a/statistics.h +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2012-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 - */ - -#ifndef _BATCTL_STATISTICS_H -#define _BATCTL_STATISTICS_H - -int statistics(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/throughputmeter.c b/throughputmeter.c index bb53d56..372bfc4 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -21,7 +21,6 @@ */ #include "main.h" -#include "throughputmeter.h" #include <netinet/ether.h> #include <netinet/in.h> @@ -389,7 +388,7 @@ static void tp_meter_usage(void) fprintf(stderr, "\t -n don't convert addresses to bat-host names\n"); } -int throughputmeter(char *mesh_iface, int argc, char **argv) +static int throughputmeter(char *mesh_iface, int argc, char **argv) { struct bat_host *bat_host; uint64_t throughput; @@ -543,3 +542,5 @@ out: bat_hosts_free(); return ret; } + +COMMAND(throughputmeter, "tp"); diff --git a/throughputmeter.h b/throughputmeter.h deleted file mode 100644 index 2c04c12..0000000 --- a/throughputmeter.h +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2013-2018 B.A.T.M.A.N. contributors: - * - * Antonio Quartulli <a(a)unstable.cc> - * - * 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 - */ - -#ifndef _BATCTL_THROUGHPUTMETER_H -#define _BATCTL_THROUGHPUTMETER_H - -int throughputmeter(char *mesh_iface, int argc, char **argv); - -#endif /* _BATCTL_THROUGHPUTMETER_H */ diff --git a/traceroute.c b/traceroute.c index ba7e27d..5c55c7b 100644 --- a/traceroute.c +++ b/traceroute.c @@ -36,7 +36,6 @@ #include "batadv_packet.h" #include "main.h" -#include "traceroute.h" #include "functions.h" #include "bat-hosts.h" #include "debugfs.h" @@ -56,7 +55,7 @@ static void traceroute_usage(void) fprintf(stderr, " \t -T don't try to translate mac to originator address\n"); } -int traceroute(char *mesh_iface, int argc, char **argv) +static int traceroute(char *mesh_iface, int argc, char **argv) { struct batadv_icmp_packet icmp_packet_out, icmp_packet_in; struct bat_host *bat_host; @@ -231,3 +230,5 @@ out: bat_hosts_free(); return ret; } + +COMMAND(traceroute, "tr"); diff --git a/traceroute.h b/traceroute.h deleted file mode 100644 index ffe0252..0000000 --- a/traceroute.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_TRACEROUTE_H -#define _BATCTL_TRACEROUTE_H - -int traceroute(char *mesh_iface, int argc, char **argv); - -#endif diff --git a/translate.c b/translate.c index 9059f20..ec6baaf 100644 --- a/translate.c +++ b/translate.c @@ -24,7 +24,6 @@ #include <stdlib.h> #include "main.h" -#include "translate.h" #include "functions.h" #include "bat-hosts.h" @@ -34,7 +33,7 @@ static void translate_usage(void) fprintf(stderr, "Usage: batctl [options] translate mac|bat-host|host_name|IPv4_address\n"); } -int translate(char *mesh_iface, int argc, char **argv) +static int translate(char *mesh_iface, int argc, char **argv) { struct ether_addr *dst_mac = NULL; struct bat_host *bat_host; @@ -78,3 +77,5 @@ out: bat_hosts_free(); return ret; } + +COMMAND(translate, "t"); diff --git a/translate.h b/translate.h deleted file mode 100644 index 8155827..0000000 --- a/translate.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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 - */ - -#ifndef _BATCTL_TRANSLATE_H -#define _BATCTL_TRANSLATE_H - -int translate(char *mesh_iface, int argc, char **argv); - -#endif

1 0

[batctl] master: batctl: Add per command flags (df94eba)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit df94eba4ccc05aea6f5f91948c292a3e9f8720b6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:13 2018 +0200 batctl: Add per command flags Some commands have different prerequists than other commands. Using flags to specify them would allow batctl to use the same command structure for the non-mesh_iface based command as for mesh_iface based commands. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- df94eba4ccc05aea6f5f91948c292a3e9f8720b6 gw_mode.c | 2 +- log.c | 2 +- loglevel.c | 2 +- main.c | 13 ++++++++++--- main.h | 12 +++++++++--- ping.c | 2 +- statistics.c | 2 +- throughputmeter.c | 2 +- traceroute.c | 2 +- translate.c | 2 +- 10 files changed, 27 insertions(+), 14 deletions(-) diff --git a/gw_mode.c b/gw_mode.c index 884f38e..f07dc99 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -167,4 +167,4 @@ out: return res; } -COMMAND(gw_mode, "gw"); +COMMAND(gw_mode, "gw", COMMAND_FLAG_MESH_IFACE); diff --git a/log.c b/log.c index 66594f6..585f1c9 100644 --- a/log.c +++ b/log.c @@ -69,4 +69,4 @@ static int log_print(char *mesh_iface, int argc, char **argv) return res; } -COMMAND_NAMED(log, "l", log_print); +COMMAND_NAMED(log, "l", log_print, COMMAND_FLAG_MESH_IFACE); diff --git a/loglevel.c b/loglevel.c index 3d9cf3a..06519e7 100644 --- a/loglevel.c +++ b/loglevel.c @@ -143,4 +143,4 @@ out: return res; } -COMMAND(loglevel, "ll"); +COMMAND(loglevel, "ll", COMMAND_FLAG_MESH_IFACE); diff --git a/main.c b/main.c index 14f4774..dacfb12 100644 --- a/main.c +++ b/main.c @@ -169,12 +169,19 @@ int main(int argc, char **argv) ret = routing_algo(mesh_iface, argc - 1, argv + 1); - } 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); - exit(EXIT_FAILURE); } else if ((cmd = find_command(argv[1]))) { + 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); + exit(EXIT_FAILURE); + } + ret = cmd->handler(mesh_iface, argc - 1, argv + 1); } 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); + exit(EXIT_FAILURE); + } for (i = 0; i < BATCTL_SETTINGS_NUM; i++) { if ((strcmp(argv[1], batctl_settings[i].opt_long) != 0) && diff --git a/main.h b/main.h index f7e2f64..c461d6b 100644 --- a/main.h +++ b/main.h @@ -57,22 +57,28 @@ extern char module_ver_path[]; #define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ (int)(vid & VLAN_VID_MASK) : -1) +enum command_flags { + COMMAND_FLAG_MESH_IFACE = BIT(0), +}; + struct command { const char *name; const char *abbr; int (*handler)(char *mesh_iface, int argc, char **argv); + uint32_t flags; }; -#define COMMAND_NAMED(_name, _abbr, _handler) \ +#define COMMAND_NAMED(_name, _abbr, _handler, _flags) \ static const struct command command_ ## _name = { \ .name = (#_name), \ .abbr = _abbr, \ .handler = (_handler), \ + .flags = (_flags), \ }; \ static const struct command *__command_ ## _name \ __attribute__((__used__)) __attribute__ ((__section__ ("__command"))) = &command_ ## _name -#define COMMAND(_handler, _abbr) \ - COMMAND_NAMED(_handler, _abbr, _handler) +#define COMMAND(_handler, _abbr, _flags) \ + COMMAND_NAMED(_handler, _abbr, _handler, _flags) #endif diff --git a/ping.c b/ping.c index a4a1851..2da49d4 100644 --- a/ping.c +++ b/ping.c @@ -345,4 +345,4 @@ out: return ret; } -COMMAND(ping, "p"); +COMMAND(ping, "p", COMMAND_FLAG_MESH_IFACE); diff --git a/statistics.c b/statistics.c index dea3ac1..cb6c1e8 100644 --- a/statistics.c +++ b/statistics.c @@ -126,4 +126,4 @@ out: return ret; } -COMMAND(statistics, "s"); +COMMAND(statistics, "s", COMMAND_FLAG_MESH_IFACE); diff --git a/throughputmeter.c b/throughputmeter.c index 372bfc4..e9e318c 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -543,4 +543,4 @@ out: return ret; } -COMMAND(throughputmeter, "tp"); +COMMAND(throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE); diff --git a/traceroute.c b/traceroute.c index 5c55c7b..1352201 100644 --- a/traceroute.c +++ b/traceroute.c @@ -231,4 +231,4 @@ out: return ret; } -COMMAND(traceroute, "tr"); +COMMAND(traceroute, "tr", COMMAND_FLAG_MESH_IFACE); diff --git a/translate.c b/translate.c index ec6baaf..d2d34f5 100644 --- a/translate.c +++ b/translate.c @@ -78,4 +78,4 @@ out: return ret; } -COMMAND(translate, "t"); +COMMAND(translate, "t", COMMAND_FLAG_MESH_IFACE);

1 0

[batctl] master: batctl: Use common code organization for statistics (8407f37)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 8407f3750c35e7c653a536b3d2791203e57f2dd9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:05 2018 +0200 batctl: Use common code organization for statistics Most commands have a separate file which is called like command itself. They also tend to share the same function signature to make it easier to use. Do the same for the ethtool statistics to make it easier to find. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8407f3750c35e7c653a536b3d2791203e57f2dd9 Makefile | 2 +- main.c | 4 ++-- ioctl.c => statistics.c | 6 ++++-- ioctl.h => statistics.h | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4b417d5..6f620be 100755 --- a/Makefile +++ b/Makefile @@ -34,10 +34,10 @@ OBJ += genl.o OBJ += hash.o OBJ += icmp_helper.o OBJ += interface.o -OBJ += ioctl.o OBJ += main.o OBJ += netlink.o OBJ += ping.o +OBJ += statistics.o OBJ += sys.o OBJ += tcpdump.o OBJ += tp_meter.o diff --git a/main.c b/main.c index d5504e0..e904a1f 100644 --- a/main.c +++ b/main.c @@ -37,7 +37,7 @@ #include "tcpdump.h" #include "tp_meter.h" #include "bisect_iv.h" -#include "ioctl.h" +#include "statistics.h" #include "functions.h" char mesh_dfl_iface[] = "bat0"; @@ -187,7 +187,7 @@ int main(int argc, char **argv) } else if ((strcmp(argv[1], "statistics") == 0) || (strcmp(argv[1], "s") == 0)) { - ret = ioctl_statistics_get(mesh_iface); + ret = statistics(mesh_iface, argc - 1, argv + 1); } else if ((strcmp(argv[1], "translate") == 0) || (strcmp(argv[1], "t") == 0)) { diff --git a/ioctl.c b/statistics.c similarity index 95% rename from ioctl.c rename to statistics.c index 6f9a056..8a889ca 100644 --- a/ioctl.c +++ b/statistics.c @@ -34,7 +34,8 @@ #include <linux/ethtool.h> #include <stdint.h> -#include "ioctl.h" +#include "main.h" +#include "statistics.h" void check_root_or_die(const char *cmd); @@ -102,7 +103,8 @@ out: return ret; } -int ioctl_statistics_get(char *mesh_iface) +int statistics(char *mesh_iface, int argc __maybe_unused, + char **argv __maybe_unused) { struct ifreq ifr; int fd = -1, ret = EXIT_FAILURE; diff --git a/ioctl.h b/statistics.h similarity index 88% rename from ioctl.h rename to statistics.h index 1b216c0..3737a48 100644 --- a/ioctl.h +++ b/statistics.h @@ -20,9 +20,9 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ -#ifndef _BATCTL_IOCTL_H -#define _BATCTL_IOCTL_H +#ifndef _BATCTL_STATISTICS_H +#define _BATCTL_STATISTICS_H -int ioctl_statistics_get(char *mesh_iface); +int statistics(char *mesh_iface, int argc, char **argv); #endif

1 0

[batctl] master: batctl: Move log command to separate file (15c4249)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 15c4249f1e8ae63a1a8304f1b1d83cae98f618f8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:08 2018 +0200 batctl: Move log command to separate file More complex commands in batctl are stored in separate files which are called like the actual command name. This makes it easier to group functionality and detect which parts belong to a more complex construct. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 15c4249f1e8ae63a1a8304f1b1d83cae98f618f8 Makefile | 1 + debug.c | 41 --------------------------------- debug.h | 1 - log.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ping.h => log.h | 6 ++--- main.c | 1 + 6 files changed, 75 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index 1271200..a988058 100755 --- a/Makefile +++ b/Makefile @@ -35,6 +35,7 @@ OBJ += hash.o OBJ += icmp_helper.o OBJ += interface.o OBJ += loglevel.o +OBJ += log.o OBJ += main.o OBJ += netlink.o OBJ += ping.o diff --git a/debug.c b/debug.c index 185e26d..9bc4d0c 100644 --- a/debug.c +++ b/debug.c @@ -268,44 +268,3 @@ int debug_print_routing_algos(void) debugfs_make_path(DEBUG_BATIF_PATH_FMT, "", full_path, sizeof(full_path)); return read_file(full_path, DEBUG_ROUTING_ALGOS, 0, 0, 0, 0); } - -static void log_usage(void) -{ - fprintf(stderr, "Usage: batctl [options] log [parameters]\n"); - fprintf(stderr, "parameters:\n"); - fprintf(stderr, " \t -h print this help\n"); - fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); -} - -int log_print(char *mesh_iface, int argc, char **argv) -{ - int optchar, res, read_opt = USE_BAT_HOSTS | LOG_MODE; - char full_path[MAX_PATH+1]; - char *debugfs_mnt; - - while ((optchar = getopt(argc, argv, "hn")) != -1) { - switch (optchar) { - case 'h': - log_usage(); - return EXIT_SUCCESS; - case 'n': - read_opt &= ~USE_BAT_HOSTS; - break; - default: - log_usage(); - return EXIT_FAILURE; - } - } - - check_root_or_die("batctl log"); - - debugfs_mnt = debugfs_mount(NULL); - if (!debugfs_mnt) { - fprintf(stderr, "Error - can't mount or find debugfs\n"); - return EXIT_FAILURE; - } - - debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); - res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0, 0); - return res; -} diff --git a/debug.h b/debug.h index 5508eaf..d9a2e3a 100644 --- a/debug.h +++ b/debug.h @@ -57,7 +57,6 @@ struct debug_table_data { extern const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM]; int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv); -int log_print(char *mesh_iface, int argc, char **argv); int debug_print_routing_algos(void); #endif diff --git a/log.c b/log.c new file mode 100644 index 0000000..fc31c66 --- /dev/null +++ b/log.c @@ -0,0 +1,70 @@ +// 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 <getopt.h> +#include <stdio.h> +#include <stdlib.h> + +#include "debug.h" +#include "debugfs.h" +#include "functions.h" + +static void log_usage(void) +{ + fprintf(stderr, "Usage: batctl [options] log [parameters]\n"); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); + fprintf(stderr, " \t -n don't replace mac addresses with bat-host names\n"); +} + +int log_print(char *mesh_iface, int argc, char **argv) +{ + int optchar, res, read_opt = USE_BAT_HOSTS | LOG_MODE; + char full_path[MAX_PATH+1]; + char *debugfs_mnt; + + while ((optchar = getopt(argc, argv, "hn")) != -1) { + switch (optchar) { + case 'h': + log_usage(); + return EXIT_SUCCESS; + case 'n': + read_opt &= ~USE_BAT_HOSTS; + break; + default: + log_usage(); + return EXIT_FAILURE; + } + } + + check_root_or_die("batctl log"); + + debugfs_mnt = debugfs_mount(NULL); + if (!debugfs_mnt) { + fprintf(stderr, "Error - can't mount or find debugfs\n"); + return EXIT_FAILURE; + } + + debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); + res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0, 0); + return res; +} diff --git a/ping.h b/log.h similarity index 89% copy from ping.h copy to log.h index f09ffb2..4ba00e3 100644 --- a/ping.h +++ b/log.h @@ -20,9 +20,9 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ -#ifndef _BATCTL_PING_H -#define _BATCTL_PING_H +#ifndef _BATCTL_LOG_H +#define _BATCTL_LOG_H -int ping(char *mesh_iface, int argc, char **argv); +int log_print(char *mesh_iface, int argc, char **argv); #endif diff --git a/main.c b/main.c index ac4bc47..5b3e570 100644 --- a/main.c +++ b/main.c @@ -39,6 +39,7 @@ #include "bisect_iv.h" #include "statistics.h" #include "loglevel.h" +#include "log.h" #include "functions.h" char mesh_dfl_iface[] = "bat0";

1 0

[batctl] master: batctl: Drop unused define SOCKET_PATH_FMT (31ad001)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 31ad00193da430c56c7a271d5e89f1fc0060db2c Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:04 2018 +0200 batctl: Drop unused define SOCKET_PATH_FMT The commit 4bd751eed4dc ("batctl: Implement non-routing batadv_icmp in userspace") removed the last code section which referenced SOCKET_PATH_FMT. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 31ad00193da430c56c7a271d5e89f1fc0060db2c main.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.h b/main.h index 5cd2f46..e8c6db7 100644 --- a/main.h +++ b/main.h @@ -29,8 +29,6 @@ #define SOURCE_VERSION "2018.4" #endif -#define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" - #define EXIT_NOSUCCESS 2 #define OPT_LONG_MAX_LEN 25

1 0

[batctl] master: batctl: Move gw_mode command to separate file (3623212)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 362321222bc59b7a09ea6a0e1d1660b7ee943342 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:09 2018 +0200 batctl: Move gw_mode command to separate file More complex commands in batctl are stored in separate files which are called like the actual command name. This makes it easier to group functionality and detect which parts belong to a more complex construct. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 362321222bc59b7a09ea6a0e1d1660b7ee943342 Makefile | 1 + gw_mode.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++ ping.h => gw_mode.h | 6 +- main.c | 3 +- sys.c | 129 ---------------------------------------- sys.h | 10 ---- 6 files changed, 174 insertions(+), 143 deletions(-) diff --git a/Makefile b/Makefile index a988058..9b960b6 100755 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ OBJ += debugfs.o OBJ += debug.o OBJ += functions.o OBJ += genl.o +OBJ += gw_mode.o OBJ += hash.o OBJ += icmp_helper.o OBJ += interface.o diff --git a/gw_mode.c b/gw_mode.c new file mode 100644 index 0000000..a92644e --- /dev/null +++ b/gw_mode.c @@ -0,0 +1,168 @@ +// 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 <getopt.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "functions.h" +#include "sys.h" + +#define SYS_GW_MODE "gw_mode" +#define SYS_GW_SEL "gw_sel_class" +#define SYS_GW_BW "gw_bandwidth" + +enum gw_modes { + GW_MODE_OFF, + GW_MODE_CLIENT, + GW_MODE_SERVER, +}; + +static void gw_mode_usage(void) +{ + fprintf(stderr, "Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); + fprintf(stderr, "options:\n"); + fprintf(stderr, " \t -h print this help\n"); +} + +int gw_mode(char *mesh_iface, int argc, char **argv) +{ + int optchar, res = EXIT_FAILURE; + char *path_buff, gw_mode; + const char **ptr; + + while ((optchar = getopt(argc, argv, "h")) != -1) { + switch (optchar) { + case 'h': + gw_mode_usage(); + return EXIT_SUCCESS; + default: + gw_mode_usage(); + return EXIT_FAILURE; + } + } + + path_buff = malloc(PATH_BUFF_LEN); + if (!path_buff) { + fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); + return EXIT_FAILURE; + } + + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + + if (argc == 1) { + res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0, 0); + + if (res != EXIT_SUCCESS) + goto out; + + if (line_ptr[strlen(line_ptr) - 1] == '\n') + line_ptr[strlen(line_ptr) - 1] = '\0'; + + if (strcmp(line_ptr, "client") == 0) + gw_mode = GW_MODE_CLIENT; + else if (strcmp(line_ptr, "server") == 0) + gw_mode = GW_MODE_SERVER; + else + gw_mode = GW_MODE_OFF; + + free(line_ptr); + line_ptr = NULL; + + switch (gw_mode) { + case GW_MODE_CLIENT: + res = read_file(path_buff, SYS_GW_SEL, USE_READ_BUFF, 0, 0, 0); + break; + case GW_MODE_SERVER: + res = read_file(path_buff, SYS_GW_BW, USE_READ_BUFF, 0, 0, 0); + break; + default: + printf("off\n"); + goto out; + } + + if (res != EXIT_SUCCESS) + goto out; + + if (line_ptr[strlen(line_ptr) - 1] == '\n') + line_ptr[strlen(line_ptr) - 1] = '\0'; + + switch (gw_mode) { + case GW_MODE_CLIENT: + printf("client (selection class: %s)\n", line_ptr); + break; + case GW_MODE_SERVER: + printf("server (announced bw: %s)\n", line_ptr); + break; + default: + goto out; + } + + free(line_ptr); + line_ptr = NULL; + goto out; + } + + check_root_or_die("batctl gw_mode"); + + if (strcmp(argv[1], "client") == 0) + gw_mode = GW_MODE_CLIENT; + else if (strcmp(argv[1], "server") == 0) + gw_mode = GW_MODE_SERVER; + else if (strcmp(argv[1], "off") == 0) + gw_mode = GW_MODE_OFF; + else + goto opt_err; + + res = write_file(path_buff, SYS_GW_MODE, argv[1], NULL); + if (res != EXIT_SUCCESS) + goto out; + + if (argc == 2) + goto out; + + switch (gw_mode) { + case GW_MODE_CLIENT: + res = write_file(path_buff, SYS_GW_SEL, argv[2], NULL); + break; + case GW_MODE_SERVER: + res = write_file(path_buff, SYS_GW_BW, argv[2], NULL); + break; + } + + goto out; + +opt_err: + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + fprintf(stderr, "The following values are allowed:\n"); + + ptr = sysfs_param_server; + while (*ptr) { + fprintf(stderr, " * %s\n", *ptr); + ptr++; + } + +out: + free(path_buff); + return res; +} diff --git a/ping.h b/gw_mode.h similarity index 89% copy from ping.h copy to gw_mode.h index f09ffb2..d4d3fb5 100644 --- a/ping.h +++ b/gw_mode.h @@ -20,9 +20,9 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ -#ifndef _BATCTL_PING_H -#define _BATCTL_PING_H +#ifndef _BATCTL_GW_MODE_H +#define _BATCTL_GW_MODE_H -int ping(char *mesh_iface, int argc, char **argv); +int gw_mode(char *mesh_iface, int argc, char **argv); #endif diff --git a/main.c b/main.c index 5b3e570..6160a72 100644 --- a/main.c +++ b/main.c @@ -40,6 +40,7 @@ #include "statistics.h" #include "loglevel.h" #include "log.h" +#include "gw_mode.h" #include "functions.h" char mesh_dfl_iface[] = "bat0"; @@ -179,7 +180,7 @@ int main(int argc, char **argv) } else if ((strcmp(argv[1], "gw_mode") == 0) || (strcmp(argv[1], "gw") == 0)) { - ret = handle_gw_setting(mesh_iface, argc - 1, argv + 1); + ret = gw_mode(mesh_iface, argc - 1, argv + 1); } else if ((strcmp(argv[1], "statistics") == 0) || (strcmp(argv[1], "s") == 0)) { diff --git a/sys.c b/sys.c index 366f7a2..14f322c 100644 --- a/sys.c +++ b/sys.c @@ -206,135 +206,6 @@ out: return res; } -static void gw_mode_usage(void) -{ - fprintf(stderr, "Usage: batctl [options] gw_mode [mode] [sel_class|bandwidth]\n"); - fprintf(stderr, "options:\n"); - fprintf(stderr, " \t -h print this help\n"); -} - -int handle_gw_setting(char *mesh_iface, int argc, char **argv) -{ - int optchar, res = EXIT_FAILURE; - char *path_buff, gw_mode; - const char **ptr; - - while ((optchar = getopt(argc, argv, "h")) != -1) { - switch (optchar) { - case 'h': - gw_mode_usage(); - return EXIT_SUCCESS; - default: - gw_mode_usage(); - return EXIT_FAILURE; - } - } - - path_buff = malloc(PATH_BUFF_LEN); - if (!path_buff) { - fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); - return EXIT_FAILURE; - } - - snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); - - if (argc == 1) { - res = read_file(path_buff, SYS_GW_MODE, USE_READ_BUFF, 0, 0, 0); - - if (res != EXIT_SUCCESS) - goto out; - - if (line_ptr[strlen(line_ptr) - 1] == '\n') - line_ptr[strlen(line_ptr) - 1] = '\0'; - - if (strcmp(line_ptr, "client") == 0) - gw_mode = GW_MODE_CLIENT; - else if (strcmp(line_ptr, "server") == 0) - gw_mode = GW_MODE_SERVER; - else - gw_mode = GW_MODE_OFF; - - free(line_ptr); - line_ptr = NULL; - - switch (gw_mode) { - case GW_MODE_CLIENT: - res = read_file(path_buff, SYS_GW_SEL, USE_READ_BUFF, 0, 0, 0); - break; - case GW_MODE_SERVER: - res = read_file(path_buff, SYS_GW_BW, USE_READ_BUFF, 0, 0, 0); - break; - default: - printf("off\n"); - goto out; - } - - if (res != EXIT_SUCCESS) - goto out; - - if (line_ptr[strlen(line_ptr) - 1] == '\n') - line_ptr[strlen(line_ptr) - 1] = '\0'; - - switch (gw_mode) { - case GW_MODE_CLIENT: - printf("client (selection class: %s)\n", line_ptr); - break; - case GW_MODE_SERVER: - printf("server (announced bw: %s)\n", line_ptr); - break; - default: - goto out; - } - - free(line_ptr); - line_ptr = NULL; - goto out; - } - - check_root_or_die("batctl gw_mode"); - - if (strcmp(argv[1], "client") == 0) - gw_mode = GW_MODE_CLIENT; - else if (strcmp(argv[1], "server") == 0) - gw_mode = GW_MODE_SERVER; - else if (strcmp(argv[1], "off") == 0) - gw_mode = GW_MODE_OFF; - else - goto opt_err; - - res = write_file(path_buff, SYS_GW_MODE, argv[1], NULL); - if (res != EXIT_SUCCESS) - goto out; - - if (argc == 2) - goto out; - - switch (gw_mode) { - case GW_MODE_CLIENT: - res = write_file(path_buff, SYS_GW_SEL, argv[2], NULL); - break; - case GW_MODE_SERVER: - res = write_file(path_buff, SYS_GW_BW, argv[2], NULL); - break; - } - - goto out; - -opt_err: - fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); - fprintf(stderr, "The following values are allowed:\n"); - - ptr = sysfs_param_server; - while (*ptr) { - fprintf(stderr, " * %s\n", *ptr); - ptr++; - } - -out: - free(path_buff); - return res; -} - static void ra_mode_usage(void) { fprintf(stderr, "Usage: batctl [options] routing_algo [algorithm]\n"); diff --git a/sys.h b/sys.h index 5e98ab1..e1d0f9b 100644 --- a/sys.h +++ b/sys.h @@ -28,9 +28,6 @@ #define SYS_BATIF_PATH_FMT "/sys/class/net/%s/mesh/" #define SYS_LOG_LEVEL "log_level" #define SYS_LOG "log" -#define SYS_GW_MODE "gw_mode" -#define SYS_GW_SEL "gw_sel_class" -#define SYS_GW_BW "gw_bandwidth" #define SYS_IFACE_PATH "/sys/class/net" #define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/" #define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" @@ -54,12 +51,6 @@ enum batctl_settings_list { BATCTL_SETTINGS_NUM, }; -enum gw_modes { - GW_MODE_OFF, - GW_MODE_CLIENT, - GW_MODE_SERVER, -}; - struct settings_data { const char opt_long[OPT_LONG_MAX_LEN]; const char opt_short[OPT_SHORT_MAX_LEN]; @@ -72,7 +63,6 @@ extern const char *sysfs_param_server[]; extern const struct settings_data batctl_settings[BATCTL_SETTINGS_NUM]; int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv); -int handle_gw_setting(char *mesh_iface, int argc, char **argv); int handle_ra_setting(int argc, char **argv); #endif

1 0

[batctl] master: batctl: Drop legacy vis_* related warning messages (298cd1e)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 298cd1ed76624d76ea006cb0ecc90e6414604798 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:06 2018 +0200 batctl: Drop legacy vis_* related warning messages The vis support code was removed with batman-adv 2014.0.0 (Linux 3.13). All kernel versions with up to this version are EOL for a while and also batctl warned now about this problem for nearly 5 years. It should therefore no (serious) problem to remove these warning messages. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 298cd1ed76624d76ea006cb0ecc90e6414604798 debug.c | 28 ---------------------------- debug.h | 1 - main.c | 6 ------ 3 files changed, 35 deletions(-) diff --git a/debug.c b/debug.c index 63fb633..185e26d 100644 --- a/debug.c +++ b/debug.c @@ -269,34 +269,6 @@ int debug_print_routing_algos(void) return read_file(full_path, DEBUG_ROUTING_ALGOS, 0, 0, 0, 0); } -int print_vis_info(char *mesh_iface) -{ - char full_path[MAX_PATH+1]; - char *debugfs_mnt; - FILE *fp; - - check_root_or_die("batctl vis_data"); - - debugfs_mnt = debugfs_mount(NULL); - if (!debugfs_mnt) { - fprintf(stderr, "Error - can't mount or find debugfs\n"); - return -1; - } - - debugfs_make_path(DEBUG_BATIF_PATH_FMT "/vis_data", mesh_iface, full_path, sizeof(full_path)); - fp = fopen(full_path, "r"); - if (fp) { - fclose(fp); - fprintf(stderr, "Error - batctl version is newer than kernel module - the kernel module still supports\n" - "vis, but later versions will not. The vis functionality has been moved to the userspace\n" - "daemon ''alfred''. Please either downgrade to an older (compatible) batctl version or use alfred.\n"); - } else { - fprintf(stderr, "Error - The installed batctl version and kernel module don't have vis support. The vis functionality\n" - "has been moved to the userspace daemon ''alfred''.\n"); - } - return 0; -} - static void log_usage(void) { fprintf(stderr, "Usage: batctl [options] log [parameters]\n"); diff --git a/debug.h b/debug.h index 9c57aa6..5508eaf 100644 --- a/debug.h +++ b/debug.h @@ -59,6 +59,5 @@ extern const struct debug_table_data batctl_debug_tables[BATCTL_TABLE_NUM]; int handle_debug_table(char *mesh_iface, int debug_table, int argc, char **argv); int log_print(char *mesh_iface, int argc, char **argv); int debug_print_routing_algos(void); -int print_vis_info(char *mesh_iface); #endif diff --git a/main.c b/main.c index e904a1f..3a6011b 100644 --- a/main.c +++ b/main.c @@ -175,12 +175,6 @@ int main(int argc, char **argv) ret = log_print(mesh_iface, argc - 1, argv + 1); - /* vis legacy support */ - } else if ((strcmp(argv[1], "vis_data") == 0) || (strcmp(argv[1], "vd") == 0) || - (strcmp(argv[1], "vis_mode") == 0) || (strcmp(argv[1], "vm") == 0)) { - - ret = print_vis_info(mesh_iface); - } else if ((strcmp(argv[1], "gw_mode") == 0) || (strcmp(argv[1], "gw") == 0)) { ret = handle_gw_setting(mesh_iface, argc - 1, argv + 1);

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