commits

commits@lists.open-mesh.org

1 participants
12414 discussions

[batman-adv] master: batman-adv: Start new development cycle (0877c9c4)
by postmaster＠open-mesh.org 01 Aug '19

01 Aug '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 0877c9c472cbabf2cd12f67fe4eb5e57c3f3acd9 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Aug 1 14:17:38 2019 +0200 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 0877c9c472cbabf2cd12f67fe4eb5e57c3f3acd9 net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 3d4c04d8..6967f2e4 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2019.3" +#define BATADV_SOURCE_VERSION "2019.4" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] master: batman-adv: Update CHANGELOG for upcoming release (56f2c435)
by postmaster＠open-mesh.org 01 Aug '19

01 Aug '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 56f2c4353901811b3d70b442326ee4e283768c91 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Aug 1 14:17:08 2019 +0200 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 56f2c4353901811b3d70b442326ee4e283768c91 CHANGELOG.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 77885e39..62bb9450 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,16 @@ .. SPDX-License-Identifier: GPL-2.0 +2019.3 (2019-08-01) +=================== + +* support latest kernels (3.16 - 5.3) +* coding style cleanups and refactoring +* add routable multicast optimizations +* bugs squashed: + + - fix duplicated OGMs on NETDEV_UP + - fix dumping of multicast flags + 2019.2 (2019-05-23) ===================

1 0

[linux-merge]linux integration; annotated tag, v5.3-rc2, created. v5.3-rc2
by postmaster＠open-mesh.org 28 Jul '19

28 Jul '19

The annotated tag, v5.3-rc2 has been created at d450c62c027d1e6c171e3ac86011c226e396d2cf (tag) tagging 609488bc979f99f805f34e9a32c1e3b71179d10b (commit) replaces v5.3-rc1 tagged by Linus Torvalds on Sun Jul 28 12:47:14 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.3-rc2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl09+8IeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGMtgH/3yxnVbzgPatWSd9 w5ahpB+nQ2sludZQXcqmychDsNoGlhxmSxxufxUJ6OL7/lOnfjb4Bc3icNltVlCk s32YyOH7Z/f+zGBE2IkCUK0ttr5bDdENmwJUOjoB39KsPXNK1y46x83QLeorKvBA kOyPtjhgy0nL2UaiM0HKuzMoypslKqwaw4ptXzHQBUkib+WdxVGYLQrTjflkpUMl 71EYwNnVgKwYRuvnMATB5bSgQCASInuF5eHJv9N7XbnBjJ9yVZNARvWW1sX4gNVe vCET+mCRWsMD80Sdnt9RJ8Nt2AEf0dgk2fAVwKqX58vuMIXlD27dayIYkVmJojE0 YuAvnAU= =X832 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.3-rc1, created. v5.3-rc1
by postmaster＠open-mesh.org 21 Jul '19

21 Jul '19

The annotated tag, v5.3-rc1 has been created at cc8d7c0499f1b15ae71a54981dd1b441888b0e08 (tag) tagging 5f9e832c137075045d15cd6899ab0505cfb2ca4b (commit) replaces v5.2 tagged by Linus Torvalds on Sun Jul 21 14:05:48 2019 -0700 - Shortlog ------------------------------------------------------------ Linus 5.3-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl0006weHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGaDUIAJ4oTyVWpMRZkfG6 vVY8qVMU3zlzEqRiyLYjkXoe/mGpuU/UVTyyStllxZ+Gg9da0mGwlugScKriPJof 4KRUDDTGX5DrfEOo+0brKvM+PYh9uGViPgKXzyv7i6BrnX2z3JdBR4bKNuEYlAJ9 N93Qg7v05SBHIq2Gfp3klrdWbsTTW2EaDTLbcgifXLnfKyFr47kwsmXAHPlTFP0p dYsZHHmf14Y9n1+ToZeVINgjQFr6mFn6ygY/PqTnd6vCgEEfP9eENJ4BZCtN1ZL/ V0BO9MyJ5iZV0AfwSEKydk+kDEvO16TG/nyDrECVuur7AXsBx18ZplVc787f6GK+ dyCQJ3U= =XLAF -----END PGP SIGNATURE----- David S. Miller (1): Merge git://git.kernel.org/.../davem/net Greg Kroah-Hartman (1): batman-adv: no need to check return value of debugfs_create functions Jeremy Sowden (1): batman-adv: fix for leaked TVLV handler. Linus Lüssing (5): batman-adv: mcast: shorten multicast tt/tvlv worker spinlock section batman-adv: mcast: collect softif listeners from IP lists instead batman-adv: mcast: avoid redundant multicast TT entries with bridges batman-adv: mcast: detect, distribute and maintain multicast router presence batman-adv: mcast: apply optimizations for routable packets, too Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (4): batman-adv: Fix includes for *_MAX constants batman-adv: Add missing include for atomic functions batman-adv: Use includes instead of fwdecls batman-adv: Fix duplicated OGMs on NETDEV_UP ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: batctl: Fix command restriction for meshif-only prefix (1d7dba8)
by postmaster＠open-mesh.org 13 Jul '19

13 Jul '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 1d7dba848f64ffceec4ad1df2deb0055f57602b0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 13 07:47:38 2019 +0200 batctl: Fix command restriction for meshif-only prefix The allowed commands for a meshif prefix are evaluated by comparing the type bits. These are initialized completely when allowing non-meshif and meshif commands. But a meshif-only prefix did an OR without previously setting the types bitfield to 0. This could have allowed too many commands than expected. Fixes: 23f39261428e ("batctl: Replace '-m meshif' option with selector prefix") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1d7dba848f64ffceec4ad1df2deb0055f57602b0 main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 974d551..99a5f5c 100644 --- a/main.c +++ b/main.c @@ -159,7 +159,7 @@ static const struct command *find_command_by_types(uint32_t types, static const struct command *find_command(struct state *state, const char *name) { - uint32_t types; + uint32_t types = 0; switch (state->selector) { case SP_NONE_OR_MESHIF:

1 0

[batctl] master: batctl: Allow to omit explicit prefix name (f5b4e96)
by postmaster＠open-mesh.org 12 Jul '19

12 Jul '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit f5b4e96cfc7bcc4779b8bf0868742f3cf6a78590 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 9 19:26:51 2019 +0200 batctl: Allow to omit explicit prefix name batctl allows three types of netdev based prefixes * meshif <netdev> * vlan <vdev> * hardif <netdev> The first word is used to tell batctl that the netdev is expected to be of a specific type and all further information should be parsed in context of this specific type. This avoids ambiguity when parsing the command line information. But there are various situations when there is no ambiguity at all. For all of them, following points are true: * <netdev|vdev> exists * <netdev|vdev> has not the name of any existing batctl subcommand * <netdev|vdev> is not "vlan", "vid", "hardif" or "meshif" In these situations, the first word can be omitted and batctl can guess the type automatically. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- f5b4e96cfc7bcc4779b8bf0868742f3cf6a78590 functions.c | 36 +++++++++++++++++++++++++++++++++--- functions.h | 3 +++ main.c | 28 +++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/functions.c b/functions.c index 4ffa86c..69d063e 100644 --- a/functions.c +++ b/functions.c @@ -1020,11 +1020,11 @@ int translate_hard_iface(struct state *state, const char *hardif) return 0; } -static int check_mesh_iface_netlink(struct state *state) +static int check_mesh_iface_netlink(unsigned int ifindex) { struct rtnl_link_iface_data link_data; - query_rtnl_link_single(state->mesh_ifindex, &link_data); + query_rtnl_link_single(ifindex, &link_data); if (!link_data.kind_found) return -1; @@ -1034,6 +1034,36 @@ static int check_mesh_iface_netlink(struct state *state) return 0; } +int guess_netdev_type(const char *netdev, enum selector_prefix *type) +{ + struct rtnl_link_iface_data link_data; + unsigned int netdev_ifindex; + + netdev_ifindex = if_nametoindex(netdev); + if (netdev_ifindex == 0) + return -ENODEV; + + query_rtnl_link_single(netdev_ifindex, &link_data); + + if (link_data.kind_found && strcmp(link_data.kind, "batadv") == 0) { + *type = SP_MESHIF; + return 0; + } + + if (link_data.master_found && + check_mesh_iface_netlink(link_data.master) >= 0) { + *type = SP_HARDIF; + return 0; + } + + if (link_data.kind_found && strcmp(link_data.kind, "vlan") == 0) { + *type = SP_VLAN; + return 0; + } + + return -EINVAL; +} + static int check_mesh_iface_sysfs(struct state *state) { char path_buff[PATH_BUFF_LEN]; @@ -1060,7 +1090,7 @@ int check_mesh_iface(struct state *state) if (state->mesh_ifindex == 0) return -1; - ret = check_mesh_iface_netlink(state); + ret = check_mesh_iface_netlink(state->mesh_ifindex); if (ret == 0) return ret; diff --git a/functions.h b/functions.h index 0a08870..31806d4 100644 --- a/functions.h +++ b/functions.h @@ -16,6 +16,8 @@ #include <stddef.h> #include <stdint.h> +#include "main.h" + /** * enum batadv_bandwidth_units - bandwidth unit types */ @@ -54,6 +56,7 @@ int translate_mesh_iface_vlan(struct state *state, const char *vlandev); int translate_vlan_iface(struct state *state, const char *vlandev); int translate_vid(struct state *state, const char *vidstr); int translate_hard_iface(struct state *state, const char *hardif); +int guess_netdev_type(const char *netdev, enum selector_prefix *type); int get_algoname(const char *mesh_iface, char *algoname, size_t algoname_len); int check_mesh_iface(struct state *state); int check_mesh_iface_ownership(struct state *state, char *hard_iface); diff --git a/main.c b/main.c index f7e1c5e..974d551 100644 --- a/main.c +++ b/main.c @@ -204,6 +204,32 @@ static int detect_selector_prefix(int argc, char *argv[], return 0; } +static int guess_selector_prefix(int argc, char *argv[], + enum selector_prefix *selector) +{ + int ret; + + /* check if there is a direct hit with full prefix */ + ret = detect_selector_prefix(argc, argv, selector); + if (ret > 0) + return ret; + + /* not enough remaining arguments to detect anything */ + if (argc < 1) + return -EINVAL; + + /* don't try to parse subcommand names as network interface */ + if (find_command_by_types(0xffffffff, argv[0])) + return -EEXIST; + + /* check if it is a netdev - and if it exists, try to guess what kind */ + ret = guess_netdev_type(argv[0], selector); + if (ret < 0) + return ret; + + return 1; +} + static int parse_meshif_args(struct state *state, int argc, char *argv[]) { enum selector_prefix selector; @@ -211,7 +237,7 @@ static int parse_meshif_args(struct state *state, int argc, char *argv[]) char *dev_arg; int ret; - parsed_args = detect_selector_prefix(argc, argv, &selector); + parsed_args = guess_selector_prefix(argc, argv, &selector); if (parsed_args < 1) goto fallback_meshif_vlan;

1 0

[batctl] master: batctl: Add throughput_override setting command (e5e6560)
by postmaster＠open-mesh.org 12 Jul '19

12 Jul '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit e5e6560df82813a9aad4a6c958be4d8ea012e909 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 9 19:26:49 2019 +0200 batctl: Add throughput_override setting command B.A.T.M.A.N. V introduced a hard interface specific setting called throughput. It defines the throughput value to be used by B.A.T.M.A.N. V when estimating the link throughput using this interface. If the value is set to 0 then batman-adv will try to estimate the throughput by itself. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e5e6560df82813a9aad4a6c958be4d8ea012e909 Makefile | 1 + README.rst | 17 ++++++++ man/batctl.8 | 6 +++ throughput_override.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 137 insertions(+) diff --git a/Makefile b/Makefile index f071da2..e3747a2 100755 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ $(eval $(call add_command,ping,y)) $(eval $(call add_command,routing_algo,y)) $(eval $(call add_command,statistics,y)) $(eval $(call add_command,tcpdump,y)) +$(eval $(call add_command,throughput_override,y)) $(eval $(call add_command,throughputmeter,y)) $(eval $(call add_command,traceroute,y)) $(eval $(call add_command,transglobal,y)) diff --git a/README.rst b/README.rst index 92983aa..128f539 100644 --- a/README.rst +++ b/README.rst @@ -402,6 +402,23 @@ Example:: 200 +batctl throughput override +========================== + +display or modify the throughput override in kbit/s for hard interface + +Usage:: + + batctl hardif $hardif throughput_override|to [kbit] + +Example:: + + $ batctl hardif eth0 throughput_override 15000 + $ batctl hardif eth0 throughput_override 15mbit + $ batctl hardif eth0 throughput_override + 15.0 MBit + + batctl loglevel =============== diff --git a/man/batctl.8 b/man/batctl.8 index eef7cd8..d42b682 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -207,6 +207,12 @@ supported routing algorithms are displayed. Otherwise the parameter is used to select the routing algorithm for the following batX interface to be created. .br +.IP "\fBhardif <hardif>\fP \fBthroughput_override|to\fP [\fBbandwidth\fP]\fP" +If no parameter is given the current througput override is displayed otherwise +the parameter is used to set the throughput override for the specified hard +interface. +Just enter any number (optionally followed by "kbit" or "mbit"). +.br .IP "\fBisolation_mark\fP|\fBmark\fP" If no parameter is given the current isolation mark value is displayed. Otherwise the parameter is used to set or unset the isolation mark used by the diff --git a/throughput_override.c b/throughput_override.c new file mode 100644 index 0000000..28a6588 --- /dev/null +++ b/throughput_override.c @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include "functions.h" +#include "main.h" +#include "sys.h" + +static struct throughput_override_data { + uint32_t throughput_override; +} throughput_override; + +static int parse_throughput_override(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct throughput_override_data *data = settings->data; + bool ret; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + ret = parse_throughput(argv[1], "throughput override", + &data->throughput_override); + if (!ret) + return -EINVAL; + + return 0; +} + +static int print_throughput_override(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + uint32_t mbit; + + 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)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE]) + return NL_OK; + + mbit = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT_OVERRIDE]); + printf("%u.%u MBit\n", mbit / 10, mbit % 10); + + *result = 0; + return NL_STOP; +} + +static int get_attrs_elp_isolation(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, state->hif); + + return 0; +} + +static int get_throughput_override(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_HARDIF, + get_attrs_elp_isolation, print_throughput_override); +} + +static int set_attrs_throughput_override(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct throughput_override_data *data = settings->data; + + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, state->hif); + nla_put_u32(msg, BATADV_ATTR_THROUGHPUT_OVERRIDE, data->throughput_override); + + return 0; +} + +static int set_throughput_override(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_HARDIF, + set_attrs_throughput_override, NULL); +} + +static struct settings_data batctl_settings_throughput_override = { + .sysfs_name = "throughput_override", + .data = &throughput_override, + .parse = parse_throughput_override, + .netlink_get = get_throughput_override, + .netlink_set = set_throughput_override, +}; + +COMMAND_NAMED(SUBCOMMAND_HIF, throughput_override, "to", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_throughput_override, + "[mbit] \tdisplay or modify throughput_override setting");

1 0

[batctl] master: batctl: Replace '-m meshif' option with selector prefix (23f3926)
by postmaster＠open-mesh.org 12 Jul '19

12 Jul '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 23f39261428e020955d798589c12e4719eddabdb Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 9 19:26:50 2019 +0200 batctl: Replace '-m meshif' option with selector prefix The '-m meshif' option doesn't follow the prefix style which is used for VLANs/hard interfaces. It is also not clear for a user which command understands the '-m' option and which is actually operating on a global/non-meshif specific scope. To clean this up, an additional command prefix called meshif is implemented: $ batctl meshif bat0 ... This can be omitted when it would be "meshif bat0". And when it is specified, all non-meshif specific subcommands will be rejected. The old option '-m meshif' option is still available to avoid breaking existing scripts. It will will show an error message but continues to work for now. Users of batctl should still transition to the new format. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 23f39261428e020955d798589c12e4719eddabdb aggregation.c | 2 +- ap_isolation.c | 2 +- bonding.c | 2 +- bridge_loop_avoidance.c | 2 +- distributed_arp_table.c | 2 +- fragmentation.c | 2 +- gw_mode.c | 2 +- hop_penalty.c | 2 +- interface.c | 2 +- isolation_mark.c | 2 +- loglevel.c | 2 +- main.c | 33 +++++++++++++++++++++++++++------ main.h | 2 ++ man/batctl.8 | 44 ++++++++++++++++++++++---------------------- multicast_fanout.c | 2 +- multicast_forceflood.c | 2 +- multicast_mode.c | 2 +- network_coding.c | 2 +- orig_interval.c | 2 +- ping.c | 2 +- statistics.c | 2 +- sys.c | 10 +++++++++- throughputmeter.c | 2 +- traceroute.c | 2 +- translate.c | 2 +- 25 files changed, 81 insertions(+), 50 deletions(-) diff --git a/aggregation.c b/aggregation.c index 18e19d8..b9edd94 100644 --- a/aggregation.c +++ b/aggregation.c @@ -55,7 +55,7 @@ static struct settings_data batctl_settings_aggregation = { .netlink_set = set_aggregated_ogms, }; -COMMAND_NAMED(SUBCOMMAND, aggregation, "ag", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, aggregation, "ag", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_aggregation, "[0|1] \tdisplay or modify aggregation setting"); diff --git a/ap_isolation.c b/ap_isolation.c index 36fd4d6..66f8340 100644 --- a/ap_isolation.c +++ b/ap_isolation.c @@ -77,7 +77,7 @@ static struct settings_data batctl_settings_ap_isolation = { .netlink_set = set_ap_isolation, }; -COMMAND_NAMED(SUBCOMMAND, ap_isolation, "ap", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, ap_isolation, "ap", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_ap_isolation, "[0|1] \tdisplay or modify ap_isolation setting"); diff --git a/bonding.c b/bonding.c index fd95e8d..e41379c 100644 --- a/bonding.c +++ b/bonding.c @@ -54,7 +54,7 @@ static struct settings_data batctl_settings_bonding = { .netlink_set = set_bonding, }; -COMMAND_NAMED(SUBCOMMAND, bonding, "b", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, bonding, "b", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_bonding, "[0|1] \tdisplay or modify bonding setting"); diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 37acaa7..2994d2e 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -55,7 +55,7 @@ static struct settings_data batctl_settings_bridge_loop_avoidance = { .netlink_set = set_bridge_loop_avoidance, }; -COMMAND_NAMED(SUBCOMMAND, bridge_loop_avoidance, "bl", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, bridge_loop_avoidance, "bl", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_bridge_loop_avoidance, "[0|1] \tdisplay or modify bridge_loop_avoidance setting"); diff --git a/distributed_arp_table.c b/distributed_arp_table.c index cbfb296..ad88d43 100644 --- a/distributed_arp_table.c +++ b/distributed_arp_table.c @@ -55,7 +55,7 @@ static struct settings_data batctl_settings_distributed_arp_table = { .netlink_set = set_distributed_arp_table, }; -COMMAND_NAMED(SUBCOMMAND, distributed_arp_table, "dat", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, distributed_arp_table, "dat", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_distributed_arp_table, "[0|1] \tdisplay or modify distributed_arp_table setting"); diff --git a/fragmentation.c b/fragmentation.c index d4b0f54..eea2a08 100644 --- a/fragmentation.c +++ b/fragmentation.c @@ -55,7 +55,7 @@ static struct settings_data batctl_settings_fragmentation = { .netlink_set = set_fragmentation, }; -COMMAND_NAMED(SUBCOMMAND, fragmentation, "f", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, fragmentation, "f", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_fragmentation, "[0|1] \tdisplay or modify fragmentation setting"); diff --git a/gw_mode.c b/gw_mode.c index 7c17bee..97ea65f 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -392,6 +392,6 @@ out: return res; } -COMMAND(SUBCOMMAND, gw_mode, "gw", +COMMAND(SUBCOMMAND_MIF, gw_mode, "gw", COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, NULL, "[mode] \tdisplay or modify the gateway mode"); diff --git a/hop_penalty.c b/hop_penalty.c index 56e1168..5cfb51a 100644 --- a/hop_penalty.c +++ b/hop_penalty.c @@ -95,7 +95,7 @@ static struct settings_data batctl_settings_hop_penalty = { .netlink_set = set_hop_penalty, }; -COMMAND_NAMED(SUBCOMMAND, hop_penalty, "hp", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, hop_penalty, "hp", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_hop_penalty, "[penalty] \tdisplay or modify hop_penalty setting"); diff --git a/interface.c b/interface.c index 0a694c9..c2bfc74 100644 --- a/interface.c +++ b/interface.c @@ -541,5 +541,5 @@ err: return EXIT_FAILURE; } -COMMAND(SUBCOMMAND, interface, "if", 0, NULL, +COMMAND(SUBCOMMAND_MIF, interface, "if", 0, NULL, "[add|del iface(s)]\tdisplay or modify the interface settings"); diff --git a/isolation_mark.c b/isolation_mark.c index 3686317..340f33d 100644 --- a/isolation_mark.c +++ b/isolation_mark.c @@ -134,7 +134,7 @@ static struct settings_data batctl_settings_isolation_mark = { .netlink_set = set_isolation_mark, }; -COMMAND_NAMED(SUBCOMMAND, isolation_mark, "mark", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, isolation_mark, "mark", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_isolation_mark, "[mark] \tdisplay or modify isolation_mark setting"); diff --git a/loglevel.c b/loglevel.c index aff8b82..2e07edc 100644 --- a/loglevel.c +++ b/loglevel.c @@ -212,6 +212,6 @@ out: return res; } -COMMAND(SUBCOMMAND, loglevel, "ll", +COMMAND(SUBCOMMAND_MIF, loglevel, "ll", COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, NULL, "[level] \tdisplay or modify the log level"); diff --git a/main.c b/main.c index 3b3a16f..f7e1c5e 100644 --- a/main.c +++ b/main.c @@ -35,6 +35,7 @@ static void print_usage(void) { .label = "commands:\n", .types = BIT(SUBCOMMAND) | + BIT(SUBCOMMAND_MIF) | BIT(SUBCOMMAND_VID) | BIT(SUBCOMMAND_HIF), }, @@ -47,9 +48,13 @@ static void print_usage(void) "", NULL, }; + const char *meshif_prefixes[] = { + "meshif <netdev> ", + NULL, + }; const char *vlan_prefixes[] = { "vlan <vdev> ", - "vid <vid> ", + "meshif <netdev> vid <vid> ", NULL, }; const char *hardif_prefixes[] = { @@ -64,7 +69,6 @@ static void print_usage(void) fprintf(stderr, "Usage: batctl [options] command|debug table [parameters]\n"); fprintf(stderr, "options:\n"); - fprintf(stderr, " \t-m 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"); @@ -83,6 +87,10 @@ static void print_usage(void) continue; switch (cmd->type) { + case DEBUGTABLE: + case SUBCOMMAND_MIF: + prefixes = meshif_prefixes; + break; case SUBCOMMAND_VID: prefixes = vlan_prefixes; break; @@ -102,7 +110,7 @@ static void print_usage(void) snprintf(buf, sizeof(buf), "%s%s|%s", *prefix, cmd->name, cmd->abbr); - fprintf(stderr, " \t%-35s%s\n", buf, + fprintf(stderr, " \t%-43s%s\n", buf, cmd->usage); } } @@ -155,8 +163,11 @@ static const struct command *find_command(struct state *state, const char *name) switch (state->selector) { case SP_NONE_OR_MESHIF: - types = BIT(SUBCOMMAND) | - BIT(DEBUGTABLE); + types = BIT(SUBCOMMAND); + /* fall through */ + case SP_MESHIF: + types |= BIT(SUBCOMMAND_MIF) | + BIT(DEBUGTABLE); break; case SP_VLAN: types = BIT(SUBCOMMAND_VID); @@ -179,7 +190,10 @@ static int detect_selector_prefix(int argc, char *argv[], return -EINVAL; /* only detect selector prefix which identifies meshif */ - if (strcmp(argv[0], "vlan") == 0) { + if (strcmp(argv[0], "meshif") == 0) { + *selector = SP_MESHIF; + return 2; + } else if (strcmp(argv[0], "vlan") == 0) { *selector = SP_VLAN; return 2; } else if (strcmp(argv[0], "hardif") == 0) { @@ -204,6 +218,11 @@ static int parse_meshif_args(struct state *state, int argc, char *argv[]) dev_arg = argv[parsed_args - 1]; switch (selector) { + case SP_MESHIF: + snprintf(state->mesh_iface, sizeof(state->mesh_iface), "%s", + dev_arg); + state->selector = SP_MESHIF; + return parsed_args; case SP_VLAN: ret = translate_vlan_iface(state, dev_arg); if (ret < 0) { @@ -252,6 +271,7 @@ static int parse_dev_args(struct state *state, int argc, char *argv[]) switch (state->selector) { case SP_NONE_OR_MESHIF: + case SP_MESHIF: /* continue below */ break; default: @@ -297,6 +317,7 @@ int main(int argc, char **argv) "Error - multiple mesh interfaces specified\n"); goto err; } + fprintf(stderr, "Warning - option -m was deprecated in will be removed in the future\n"); state.arg_iface = argv[2]; break; diff --git a/main.h b/main.h index e3a95b5..8532bd1 100644 --- a/main.h +++ b/main.h @@ -58,12 +58,14 @@ enum command_flags { enum selector_prefix { SP_NONE_OR_MESHIF, + SP_MESHIF, SP_VLAN, SP_HARDIF, }; enum command_type { SUBCOMMAND, + SUBCOMMAND_MIF, SUBCOMMAND_VID, SUBCOMMAND_HIF, DEBUGTABLE, diff --git a/man/batctl.8 b/man/batctl.8 index d42b682..6e75cdd 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -54,42 +54,42 @@ performances, is also included. .br .TP .I \fBcommands: -.IP "\fBinterface\fP|\fBif\fP [\fB-M\fP] [\fBadd\fP|\fBdel iface(s)\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBinterface\fP|\fBif\fP [\fB-M\fP] [\fBadd\fP|\fBdel iface(s)\fP]" If no parameter is given or the first parameter is neither "add" nor "del" the current interface settings are displayed. In order to add or delete interfaces specify "add" or "del" as first argument and append the interface names you wish to add or delete. Multiple interfaces can be specified. The "\-M" option tells batctl to not automatically create the batman-adv interface on "add" or to destroy it when "del" removed all interfaces which belonged to it. -.IP "\fBinterface\fP|\fBif\fP [\fBcreate\fP|\fBdestroy\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBinterface\fP|\fBif\fP [\fBcreate\fP|\fBdestroy\fP]" A batman-adv interface without attached interfaces can be created using "create". The parameter "destroy" can be used to free all attached interfaces and remove batman-adv interface. .br -.IP "\fBorig_interval\fP|\fBit\fP [\fBinterval\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBorig_interval\fP|\fBit\fP [\fBinterval\fP]" If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. .br -.IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or disable ap isolation. .br -.IP "<\fBvlan <vdev>\fP|\fBvid <vid>\fP> \fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" +.IP "<\fBvlan <vdev>\fP|[\fBmeshif <netdev>\fP] \fBvid <vid>\fP> \fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current ap isolation setting for the specified VLAN is displayed. Otherwise the parameter is used to enable or disable ap isolation for the specified VLAN. .br -.IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable or disable the bridge loop avoidance. Bridge loop avoidance support has to be enabled when compiling the module otherwise this option won't be available. .br -.IP "\fBdistributed_arp_table\fP|\fBdat\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBdistributed_arp_table\fP|\fBdat\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current distributed arp table setting is displayed. Otherwise the parameter is used to enable or disable the distributed arp table. .br -.IP "\fBaggregation\fP|\fBag\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBaggregation\fP|\fBag\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current aggregation setting is displayed. Otherwise the parameter is used to enable or disable OGM packet aggregation. .br -.IP "\fBbonding\fP|\fBb\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBbonding\fP|\fBb\fP [\fB0\fP|\fB1\fP]" 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 @@ -101,30 +101,30 @@ when parameter \fB\-t\fP is specified. Parameter \fB\-r\fP will do the same but If no parameter is given the current ELP interval setting of the hard interface is displayed otherwise the parameter is used to set the ELP interval. The interval is in units of milliseconds. .br -.IP "\fBfragmentation\fP|\fBf\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \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. .br -.IP "\fBhop_penalty\fP|\fBhp\fP [\fBpenalty\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBhop_penalty\fP|\fBhp\fP [\fBpenalty\fP]" If no parameter is given the current hop penalty setting is displayed. Otherwise the parameter is used to set the hop penalty. The penalty is can be 0-255 (255 sets originator message's TQ to zero when forwarded by this hop). .br -.IP "\fBnetwork_coding\fP|\fBnc\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBnetwork_coding\fP|\fBnc\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current network coding mode setting is displayed. Otherwise the parameter is used to enable or disable network coding. .br -.IP "\fBmulticast_forceflood\fP|\fBmff\fP [\fB0\fP|\fB1\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBmulticast_forceflood\fP|\fBmff\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current multicast forceflood setting is displayed. Otherwise the parameter is used to enable or disable multicast forceflood. This setting defines whether multicast optimizations should be replaced by simple broadcast-like flooding of multicast packets. If set to non-zero then all nodes in the mesh are going to use classic flooding for any multicast packet with no optimizations. .br -.IP "\fBmulticast_fanout\fP|\fBmo\fP [\fBfanout\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBmulticast_fanout\fP|\fBmo\fP [\fBfanout\fP]" If no parameter is given the current multicast fanout setting is displayed. Otherwise the parameter is used to set the multicast fanout. The multicast fanout defines the maximum number of packet copies that may be generated for a multicast-to-unicast conversion. Once this limit is exceeded distribution will fall back to broadcast. .br -.IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" +.IP "[\fBmeshif <netdev>\fP] \fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to @@ -135,7 +135,7 @@ Level 'all' enables all messages. The messages are sent to the batman-adv debug Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. .br -.IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" +.IP "[\fBmeshif <netdev>\fP] \fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if 'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about @@ -213,7 +213,7 @@ the parameter is used to set the throughput override for the specified hard interface. Just enter any number (optionally followed by "kbit" or "mbit"). .br -.IP "\fBisolation_mark\fP|\fBmark\fP" +.IP "[\fBmeshif <netdev>\fP] \fBisolation_mark\fP|\fBmark\fP" If no parameter is given the current isolation mark value is displayed. Otherwise the parameter is used to set or unset the isolation mark used by the Extended Isolation feature. @@ -293,12 +293,12 @@ List of debug tables: .RE .RE .br -.IP "\fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" +.IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" Translates a destination (hostname, IP, MAC, bat_host-name) to the originator mac address responsible for it. .br -.IP "\fBstatistics\fP|\fBs\fP" +.IP "[\fBmeshif <netdev>\fP] \fBstatistics\fP|\fBs\fP" Retrieve traffic counters from batman-adv kernel module. The output may vary depending on which features have been compiled into the kernel module. .br @@ -313,7 +313,7 @@ tt - translation table counters All counters without a prefix concern payload (pure user data) traffic. .RE .br -.IP "\fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" +.IP "[\fBmeshif <netdev>\fP] \fBping\fP|\fBp\fP [\fB\-c count\fP][\fB\-i interval\fP][\fB\-t time\fP][\fB\-R\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" Layer 2 ping of a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was not a MAC address. It can also try to guess the MAC address using an IPv4/IPv6 address or a hostname when the IPv4/IPv6 address was configured on top of the batman-adv interface of the destination device and both source and @@ -324,7 +324,7 @@ interval between pings and the timeout time for replies, both in seconds. When r messages will be recorded. With "\-T" you can disable the automatic translation of a client MAC address to the originator address which is responsible for this client. .br -.IP "\fBtraceroute\fP|\fBtr\fP [\fB\-n\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" +.IP "[\fBmeshif <netdev>\fP] \fBtraceroute\fP|\fBtr\fP [\fB\-n\fP][\fB\-T\fP] \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" Layer 2 traceroute to a MAC address or bat\-host name. batctl will try to find the bat\-host name if the given parameter was not a MAC address. It can also try to guess the MAC address using an IPv4/IPv6 address or a hostname when the IPv4/IPv6 address was configured on top of the batman-adv interface of the destination device and both source and @@ -376,7 +376,7 @@ specific sequence number, min. Furthermore using "\-o" you can filter the output given batctl will not replace the MAC addresses with bat\-host names in the output. .RE .br -.IP "\fBthroughputmeter\fP|\fBtp\fP \fBMAC\fP" +.IP "[\fBmeshif <netdev>\fP] \fBthroughputmeter\fP|\fBtp\fP \fBMAC\fP" This command starts a throughput test entirely controlled by batman module in kernel space: the computational resources needed to align memory and copy data between user and kernel space that are required by other user space tools may diff --git a/multicast_fanout.c b/multicast_fanout.c index cec42a3..bea83c5 100644 --- a/multicast_fanout.c +++ b/multicast_fanout.c @@ -95,7 +95,7 @@ static struct settings_data batctl_settings_multicast_fanout = { .netlink_set = set_multicast_fanout, }; -COMMAND_NAMED(SUBCOMMAND, multicast_fanout, "mo", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, multicast_fanout, "mo", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_multicast_fanout, "[fanout] \tdisplay or modify multicast_fanout setting"); diff --git a/multicast_forceflood.c b/multicast_forceflood.c index fdc5400..f15cc12 100644 --- a/multicast_forceflood.c +++ b/multicast_forceflood.c @@ -75,7 +75,7 @@ static struct settings_data batctl_settings_multicast_forceflood = { .netlink_set = set_multicast_forceflood, }; -COMMAND_NAMED(SUBCOMMAND, multicast_forceflood, "mff", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, multicast_forceflood, "mff", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK | COMMAND_FLAG_INVERSE, &batctl_settings_multicast_forceflood, "[0|1] \tdisplay or modify multicast_forceflood setting"); diff --git a/multicast_mode.c b/multicast_mode.c index 063166e..e11d3af 100644 --- a/multicast_mode.c +++ b/multicast_mode.c @@ -75,6 +75,6 @@ static struct settings_data batctl_settings_multicast_mode = { .netlink_set = set_multicast_mode, }; -COMMAND_NAMED(SUBCOMMAND, multicast_mode, "mm", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, multicast_mode, "mm", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_multicast_mode, NULL); diff --git a/network_coding.c b/network_coding.c index d22fab0..0fdcc78 100644 --- a/network_coding.c +++ b/network_coding.c @@ -55,7 +55,7 @@ static struct settings_data batctl_settings_network_coding = { .netlink_set = set_network_coding, }; -COMMAND_NAMED(SUBCOMMAND, network_coding, "nc", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, network_coding, "nc", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_network_coding, "[0|1] \tdisplay or modify network_coding setting"); diff --git a/orig_interval.c b/orig_interval.c index a90ba27..f0e75c9 100644 --- a/orig_interval.c +++ b/orig_interval.c @@ -95,7 +95,7 @@ static struct settings_data batctl_settings_orig_interval = { .netlink_set = set_orig_interval, }; -COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, +COMMAND_NAMED(SUBCOMMAND_MIF, orig_interval, "it", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_orig_interval, "[interval] \tdisplay or modify orig_interval setting"); diff --git a/ping.c b/ping.c index aa7cbc3..cc0ac0f 100644 --- a/ping.c +++ b/ping.c @@ -323,5 +323,5 @@ out: return ret; } -COMMAND(SUBCOMMAND, ping, "p", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, ping, "p", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \tping another batman adv host via layer 2"); diff --git a/statistics.c b/statistics.c index 2a90a1d..c019d87 100644 --- a/statistics.c +++ b/statistics.c @@ -112,5 +112,5 @@ out: return ret; } -COMMAND(SUBCOMMAND, statistics, "s", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, statistics, "s", COMMAND_FLAG_MESH_IFACE, NULL, " \tprint mesh statistics"); diff --git a/sys.c b/sys.c index b9555ee..fe388fe 100644 --- a/sys.c +++ b/sys.c @@ -145,9 +145,13 @@ static void settings_usage(struct state *state) "", NULL, }; + const char *meshif_prefixes[] = { + "meshif <netdev> ", + NULL, + }; const char *vlan_prefixes[] = { "vlan <vdev> ", - "vid <vid> ", + "meshif <netdev> vid <vid> ", NULL, }; const char *hardif_prefixes[] = { @@ -159,6 +163,9 @@ static void settings_usage(struct state *state) const char **prefix; switch (state->cmd->type) { + case SUBCOMMAND_MIF: + prefixes = meshif_prefixes; + break; case SUBCOMMAND_VID: prefixes = vlan_prefixes; break; @@ -268,6 +275,7 @@ int handle_sys_setting(struct state *state, int argc, char **argv) switch (state->selector) { case SP_NONE_OR_MESHIF: + case SP_MESHIF: snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, state->mesh_iface); break; diff --git a/throughputmeter.c b/throughputmeter.c index f9d98cf..a46347d 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -529,5 +529,5 @@ out: return ret; } -COMMAND(SUBCOMMAND, throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \tstart a throughput measurement"); diff --git a/traceroute.c b/traceroute.c index d810122..07ba37f 100644 --- a/traceroute.c +++ b/traceroute.c @@ -209,5 +209,5 @@ out: return ret; } -COMMAND(SUBCOMMAND, traceroute, "tr", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, 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 a59fc14..27d53e5 100644 --- a/translate.c +++ b/translate.c @@ -64,5 +64,5 @@ out: return ret; } -COMMAND(SUBCOMMAND, translate, "t", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, translate, "t", COMMAND_FLAG_MESH_IFACE, NULL, "<destination> \ttranslate a destination to the originator responsible for it");

1 0

[batctl] master: batctl: Add elp_interval setting command (df5c452)
by postmaster＠open-mesh.org 12 Jul '19

12 Jul '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit df5c452a446951c5f2fde265d08f3c2809ac2334 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 9 19:26:48 2019 +0200 batctl: Add elp_interval setting command B.A.T.M.A.N. V introduced a hard interface specific setting called elp_interval. It defines the interval in milliseconds in which batman-adv emits probing packets for neighbor sensing (ELP). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- df5c452a446951c5f2fde265d08f3c2809ac2334 Makefile | 1 + README.rst | 16 +++++++++ elp_interval.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ man/batctl.8 | 4 +++ 4 files changed, 132 insertions(+) diff --git a/Makefile b/Makefile index b7bd545..f071da2 100755 --- a/Makefile +++ b/Makefile @@ -45,6 +45,7 @@ $(eval $(call add_command,bridge_loop_avoidance,y)) $(eval $(call add_command,claimtable,y)) $(eval $(call add_command,dat_cache,y)) $(eval $(call add_command,distributed_arp_table,y)) +$(eval $(call add_command,elp_interval,y)) $(eval $(call add_command,event,y)) $(eval $(call add_command,fragmentation,y)) $(eval $(call add_command,gateways,y)) diff --git a/README.rst b/README.rst index bc54412..92983aa 100644 --- a/README.rst +++ b/README.rst @@ -386,6 +386,22 @@ Example:: 1000 +batctl elp interval +=================== + +display or modify the elp interval in ms for hard interface + +Usage:: + + batctl hardif $hardif elp_interval|et [interval] + +Example:: + + $ batctl hardif eth0 elp_interval 200 + $ batctl hardif eth0 elp_interval + 200 + + batctl loglevel =============== diff --git a/elp_interval.c b/elp_interval.c new file mode 100644 index 0000000..0a5e989 --- /dev/null +++ b/elp_interval.c @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2019 B.A.T.M.A.N. contributors: + * + * Marek Lindner <mareklindner(a)neomailbox.ch> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> + +#include "main.h" +#include "sys.h" + +static struct elp_interval_data { + uint32_t elp_interval; +} elp_interval; + +static int parse_elp_interval(struct state *state, int argc, char *argv[]) +{ + struct settings_data *settings = state->cmd->arg; + struct elp_interval_data *data = settings->data; + char *endptr; + + if (argc != 2) { + fprintf(stderr, "Error - incorrect number of arguments (expected 1)\n"); + return -EINVAL; + } + + data->elp_interval = strtoul(argv[1], &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - the supplied argument is invalid: %s\n", argv[1]); + return -EINVAL; + } + + return 0; +} + +static int print_elp_interval(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX + 1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct genlmsghdr *ghdr; + int *result = arg; + + 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)) { + return NL_OK; + } + + if (!attrs[BATADV_ATTR_ELP_INTERVAL]) + return NL_OK; + + printf("%u\n", nla_get_u32(attrs[BATADV_ATTR_ELP_INTERVAL])); + + *result = 0; + return NL_STOP; +} + +static int get_attrs_elp_interval(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, state->hif); + + return 0; +} + +static int get_elp_interval(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_GET_HARDIF, + get_attrs_elp_interval, print_elp_interval); +} + +static int set_attrs_elp_interval(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + struct settings_data *settings = state->cmd->arg; + struct elp_interval_data *data = settings->data; + + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, state->hif); + nla_put_u32(msg, BATADV_ATTR_ELP_INTERVAL, data->elp_interval); + + return 0; +} + +static int set_elp_interval(struct state *state) +{ + return sys_simple_nlquery(state, BATADV_CMD_SET_HARDIF, + set_attrs_elp_interval, NULL); +} + +static struct settings_data batctl_settings_elp_interval = { + .sysfs_name = "elp_interval", + .data = &elp_interval, + .parse = parse_elp_interval, + .netlink_get = get_elp_interval, + .netlink_set = set_elp_interval, +}; + +COMMAND_NAMED(SUBCOMMAND_HIF, elp_interval, "et", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_elp_interval, + "[interval] \tdisplay or modify elp_interval setting"); diff --git a/man/batctl.8 b/man/batctl.8 index a5656cf..eef7cd8 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -97,6 +97,10 @@ the bonding mode. 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 "\fBhardif <hardif>\fP \fBelp_interval\fP|\fBet\fP [\fBinterval\fP]" +If no parameter is given the current ELP interval setting of the hard interface is displayed otherwise the parameter is used to set the +ELP interval. The interval is in units of milliseconds. +.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: Make vlan setting explicit (4704c5e)
by postmaster＠open-mesh.org 12 Jul '19

12 Jul '19

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 4704c5e05af7a4f6a397d80ff80f2f2c56fe8f2c Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jul 9 19:26:46 2019 +0200 batctl: Make vlan setting explicit The requirement to have a VLAN master device on top of the batadv mesh interface is artificially limiting the capabilities of batctl. Not all master devices in linux which register a VLAN are from type "vlan" and are only registering a single VLAN. For example VLAN aware bridges can create multiple VLANs. These require that the VLAN is identified using the VID and not the vlan device. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4704c5e05af7a4f6a397d80ff80f2f2c56fe8f2c ap_isolation.c | 13 ++-- functions.c | 61 ++++++++++++++---- functions.h | 4 +- main.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++------- main.h | 13 +++- man/batctl.8 | 8 ++- sys.c | 50 ++++++++++++--- 7 files changed, 294 insertions(+), 55 deletions(-) diff --git a/ap_isolation.c b/ap_isolation.c index 71dcd00..36fd4d6 100644 --- a/ap_isolation.c +++ b/ap_isolation.c @@ -28,7 +28,7 @@ static int get_attrs_ap_isolation(struct nl_msg *msg, void *arg) { struct state *state = arg; - if (state->vid >= 0) + if (state->selector == SP_VLAN) nla_put_u16(msg, BATADV_ATTR_VLANID, state->vid); return 0; @@ -38,7 +38,7 @@ static int get_ap_isolation(struct state *state) { enum batadv_nl_commands nl_cmd = BATADV_CMD_SET_MESH; - if (state->vid >= 0) + if (state->selector == SP_VLAN) nl_cmd = BATADV_CMD_GET_VLAN; return sys_simple_nlquery(state, nl_cmd, get_attrs_ap_isolation, @@ -53,7 +53,7 @@ static int set_attrs_ap_isolation(struct nl_msg *msg, void *arg) nla_put_u8(msg, BATADV_ATTR_AP_ISOLATION_ENABLED, data->val); - if (state->vid >= 0) + if (state->selector == SP_VLAN) nla_put_u16(msg, BATADV_ATTR_VLANID, state->vid); return 0; @@ -63,7 +63,7 @@ static int set_ap_isolation(struct state *state) { enum batadv_nl_commands nl_cmd = BATADV_CMD_SET_MESH; - if (state->vid >= 0) + if (state->selector == SP_VLAN) nl_cmd = BATADV_CMD_SET_VLAN; return sys_simple_nlquery(state, nl_cmd, set_attrs_ap_isolation, NULL); @@ -81,3 +81,8 @@ COMMAND_NAMED(SUBCOMMAND, ap_isolation, "ap", handle_sys_setting, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, &batctl_settings_ap_isolation, "[0|1] \tdisplay or modify ap_isolation setting"); + +COMMAND_NAMED(SUBCOMMAND_VID, ap_isolation, "ap", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_settings_ap_isolation, + "[0|1] \tdisplay or modify ap_isolation setting for vlan device or id"); diff --git a/functions.c b/functions.c index aad6327..61ea487 100644 --- a/functions.c +++ b/functions.c @@ -919,32 +919,44 @@ free_sock: return 0; } -int translate_mesh_iface(struct state *state) +int translate_vlan_iface(struct state *state, const char *vlandev) { struct rtnl_link_iface_data link_data; unsigned int arg_ifindex; - arg_ifindex = if_nametoindex(state->arg_iface); + arg_ifindex = if_nametoindex(vlandev); if (arg_ifindex == 0) - goto fallback_meshif; + return -ENODEV; query_rtnl_link_single(arg_ifindex, &link_data); if (!link_data.vid_found) - goto fallback_meshif; + return -ENODEV; if (!link_data.link_found) - goto fallback_meshif; + return -EINVAL; if (!link_data.kind_found) - goto fallback_meshif; + return -EINVAL; if (strcmp(link_data.kind, "vlan") != 0) - goto fallback_meshif; + return -EINVAL; if (!if_indextoname(link_data.link, state->mesh_iface)) - goto fallback_meshif; + return -ENODEV; state->vid = link_data.vid; + state->selector = SP_VLAN; + + return 0; +} + +int translate_mesh_iface_vlan(struct state *state, const char *vlandev) +{ + int ret; + + ret = translate_vlan_iface(state, vlandev); + if (ret < 0) + goto fallback_meshif; return 0; @@ -952,9 +964,36 @@ fallback_meshif: /* if there is no vid then the argument must be the * mesh interface */ - snprintf(state->mesh_iface, sizeof(state->mesh_iface), "%s", - state->arg_iface); - state->vid = -1; + snprintf(state->mesh_iface, sizeof(state->mesh_iface), "%s", vlandev); + state->selector = SP_NONE_OR_MESHIF; + + return 0; +} + +int translate_vid(struct state *state, const char *vidstr) +{ + unsigned long vid; + char *endptr; + + if (vidstr[0] == '\0') { + fprintf(stderr, "Error - unparsable vid\n"); + return -EINVAL; + } + + vid = strtoul(vidstr, &endptr, 0); + if (!endptr || *endptr != '\0') { + fprintf(stderr, "Error - unparsable vid\n"); + return -EINVAL; + } + + if (vid > 4095) { + fprintf(stderr, "Error - too large vid (max 4095)\n"); + return -ERANGE; + } + + /* get mesh interface and overwrite vid afterwards */ + state->vid = vid; + state->selector = SP_VLAN; return 0; } diff --git a/functions.h b/functions.h index d4a5568..7474c40 100644 --- a/functions.h +++ b/functions.h @@ -50,7 +50,9 @@ struct ether_addr *translate_mac(const char *mesh_iface, struct ether_addr *resolve_mac(const char *asc); int query_rtnl_link(int ifindex, nl_recvmsg_msg_cb_t func, void *arg); int netlink_simple_request(struct nl_msg *msg); -int translate_mesh_iface(struct state *state); +int translate_mesh_iface_vlan(struct state *state, const char *vlandev); +int translate_vlan_iface(struct state *state, const char *vlandev); +int translate_vid(struct state *state, const char *vidstr); int get_algoname(const char *mesh_iface, char *algoname, size_t algoname_len); int check_mesh_iface(struct state *state); int check_mesh_iface_ownership(struct state *state, char *hard_iface); diff --git a/main.c b/main.c index 278683c..3090877 100644 --- a/main.c +++ b/main.c @@ -28,48 +28,75 @@ extern const struct command *__stop___command[]; static void print_usage(void) { - enum command_type type[] = { - SUBCOMMAND, - DEBUGTABLE, + struct { + const char *label; + uint32_t types; + } type[] = { + { + .label = "commands:\n", + .types = BIT(SUBCOMMAND) | + BIT(SUBCOMMAND_VID), + }, + { + .label = "debug tables: \tdisplay the corresponding debug table\n", + .types = BIT(DEBUGTABLE), + }, + }; + const char *default_prefixes[] = { + "", + NULL, + }; + const char *vlan_prefixes[] = { + "vlan <vdev> ", + "vid <vid> ", + NULL, }; const struct command **p; - char buf[32]; + const char **prefixes; + const char **prefix; + char buf[64]; size_t i; 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-m 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"); for (i = 0; i < sizeof(type) / sizeof(*type); i++) { fprintf(stderr, "\n"); - switch (type[i]) { - case SUBCOMMAND: - fprintf(stderr, "commands:\n"); - break; - case DEBUGTABLE: - fprintf(stderr, "debug tables: \tdisplay the corresponding debug table\n"); - break; - } + fprintf(stderr, "%s", type[i].label); for (p = __start___command; p < __stop___command; p++) { const struct command *cmd = *p; - if (cmd->type != type[i]) + if (!(BIT(cmd->type) & type[i].types)) continue; if (!cmd->usage) 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); + switch (cmd->type) { + case SUBCOMMAND_VID: + prefixes = vlan_prefixes; + break; + default: + prefixes = default_prefixes; + break; + } + + for (prefix = &prefixes[0]; *prefix; prefix++) { + if (strcmp(cmd->name, cmd->abbr) == 0) + snprintf(buf, sizeof(buf), "%s%s", + *prefix, cmd->name); + else + snprintf(buf, sizeof(buf), "%s%s|%s", + *prefix, cmd->name, cmd->abbr); - fprintf(stderr, " \t%-27s%s\n", buf, cmd->usage); + fprintf(stderr, " \t%-35s%s\n", buf, + cmd->usage); + } } } } @@ -93,13 +120,17 @@ static void version(void) exit(EXIT_SUCCESS); } -static const struct command *find_command(const char *name) +static const struct command *find_command_by_types(uint32_t types, + const char *name) { const struct command **p; for (p = __start___command; p < __stop___command; p++) { const struct command *cmd = *p; + if (!(BIT(cmd->type) & types)) + continue; + if (strcmp(cmd->name, name) == 0) return cmd; @@ -110,13 +141,123 @@ static const struct command *find_command(const char *name) return NULL; } +static const struct command *find_command(struct state *state, const char *name) +{ + uint32_t types; + + switch (state->selector) { + case SP_NONE_OR_MESHIF: + types = BIT(SUBCOMMAND) | + BIT(DEBUGTABLE); + break; + case SP_VLAN: + types = BIT(SUBCOMMAND_VID); + break; + default: + return NULL; + } + + return find_command_by_types(types, name); +} + +static int detect_selector_prefix(int argc, char *argv[], + enum selector_prefix *selector) +{ + /* not enough remaining arguments to detect anything */ + if (argc < 2) + return -EINVAL; + + /* only detect selector prefix which identifies meshif */ + if (strcmp(argv[0], "vlan") == 0) { + *selector = SP_VLAN; + return 2; + } + + return 0; +} + +static int parse_meshif_args(struct state *state, int argc, char *argv[]) +{ + enum selector_prefix selector; + int parsed_args; + char *dev_arg; + int ret; + + parsed_args = detect_selector_prefix(argc, argv, &selector); + if (parsed_args < 1) + goto fallback_meshif_vlan; + + dev_arg = argv[parsed_args - 1]; + + switch (selector) { + case SP_VLAN: + ret = translate_vlan_iface(state, dev_arg); + if (ret < 0) { + fprintf(stderr, "Error - invalid vlan device %s: %s\n", + dev_arg, strerror(-ret)); + return ret; + } + + return parsed_args; + case SP_NONE_OR_MESHIF: + /* not allowed - see detect_selector_prefix */ + break; + } + +fallback_meshif_vlan: + /* parse vlan as part of -m parameter or mesh_dfl_iface */ + translate_mesh_iface_vlan(state, state->arg_iface); + return 0; +} + +static int parse_dev_args(struct state *state, int argc, char *argv[]) +{ + int dev_arguments; + int ret; + + /* try to parse selector prefix which can be used to identify meshif */ + dev_arguments = parse_meshif_args(state, argc, argv); + if (dev_arguments < 0) + return dev_arguments; + + /* try to parse secondary prefix selectors which cannot be used to + * identify the meshif + */ + argv += dev_arguments; + argc -= dev_arguments; + + switch (state->selector) { + case SP_NONE_OR_MESHIF: + /* continue below */ + break; + default: + return dev_arguments; + } + + /* enough room for additional selectors? */ + if (argc < 2) + return dev_arguments; + + if (strcmp(argv[0], "vid") == 0) { + ret = translate_vid(state, argv[1]); + if (ret < 0) + return ret; + + return dev_arguments + 2; + } + + return dev_arguments; +} + int main(int argc, char **argv) { const struct command *cmd; struct state state = { .arg_iface = mesh_dfl_iface, + .selector = SP_NONE_OR_MESHIF, .cmd = NULL, }; + int dev_arguments; int opt; int ret; @@ -152,7 +293,20 @@ int main(int argc, char **argv) argc -= optind; optind = 0; - cmd = find_command(argv[0]); + /* parse arguments to identify vlan, ... */ + dev_arguments = parse_dev_args(&state, argc, argv); + if (dev_arguments < 0) + goto err; + + argv += dev_arguments; + argc -= dev_arguments; + + if (argc == 0) { + fprintf(stderr, "Error - no command specified\n"); + goto err; + } + + cmd = find_command(&state, argv[0]); if (!cmd) { fprintf(stderr, "Error - no valid command or debug table specified: %s\n", @@ -162,8 +316,6 @@ int main(int argc, char **argv) state.cmd = cmd; - translate_mesh_iface(&state); - if (cmd->flags & COMMAND_FLAG_MESH_IFACE && check_mesh_iface(&state) < 0) { fprintf(stderr, diff --git a/main.h b/main.h index 3978797..846efed 100644 --- a/main.h +++ b/main.h @@ -56,13 +56,20 @@ enum command_flags { COMMAND_FLAG_INVERSE = BIT(2), }; +enum selector_prefix { + SP_NONE_OR_MESHIF, + SP_VLAN, +}; + enum command_type { SUBCOMMAND, + SUBCOMMAND_VID, DEBUGTABLE, }; struct state { char *arg_iface; + enum selector_prefix selector; char mesh_iface[IF_NAMESIZE]; unsigned int mesh_ifindex; int vid; @@ -84,7 +91,7 @@ struct command { }; #define COMMAND_NAMED(_type, _name, _abbr, _handler, _flags, _arg, _usage) \ - static const struct command command_ ## _name = { \ + static const struct command command_ ## _name ## _ ## _type = { \ .type = (_type), \ .name = (#_name), \ .abbr = _abbr, \ @@ -93,8 +100,8 @@ struct command { .arg = (_arg), \ .usage = (_usage), \ }; \ - static const struct command *__command_ ## _name \ - __attribute__((__used__)) __attribute__ ((__section__ ("__command"))) = &command_ ## _name + static const struct command *__command_ ## _name ## _ ## _type \ + __attribute__((__used__)) __attribute__ ((__section__ ("__command"))) = &command_ ## _name ## _ ## _type #define COMMAND(_type, _handler, _abbr, _flags, _arg, _usage) \ COMMAND_NAMED(_type, _handler, _abbr, _handler, _flags, _arg, _usage) diff --git a/man/batctl.8 b/man/batctl.8 index 0b43031..a5656cf 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -46,7 +46,7 @@ performances, is also included. .SH OPTIONS .TP .I \fBoptions: -\-m specify mesh interface or VLAN created on top of a mesh interface (default 'bat0') +\-m specify mesh interface (default 'bat0') .br \-h print general batctl help .br @@ -70,7 +70,11 @@ originator interval. The interval is in units of milliseconds. .br .IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or -disable ap isolation. This command can be used in conjunction with "\-m" option to target per VLAN configurations. +disable ap isolation. +.br +.IP "<\fBvlan <vdev>\fP|\fBvid <vid>\fP> \fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" +If no parameter is given the current ap isolation setting for the specified VLAN is displayed. Otherwise the parameter is used to enable or +disable ap isolation for the specified VLAN. .br .IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable diff --git a/sys.c b/sys.c index 39123db..61a314d 100644 --- a/sys.c +++ b/sys.c @@ -141,9 +141,35 @@ int sys_simple_print_boolean(struct nl_msg *msg, void *arg, static void settings_usage(struct state *state) { - fprintf(stderr, "Usage: batctl [options] %s|%s [parameters] %s\n", - state->cmd->name, state->cmd->abbr, - state->cmd->usage ? state->cmd->usage : ""); + const char *default_prefixes[] = { + "", + NULL, + }; + const char *vlan_prefixes[] = { + "vlan <vdev> ", + "vid <vid> ", + NULL, + }; + const char *linestart = "Usage:"; + const char **prefixes; + const char **prefix; + + switch (state->cmd->type) { + case SUBCOMMAND_VID: + prefixes = vlan_prefixes; + break; + default: + prefixes = default_prefixes; + break; + } + + for (prefix = &prefixes[0]; *prefix; prefix++) { + fprintf(stderr, "%s batctl [options] %s%s|%s [parameters] %s\n", + linestart, *prefix, state->cmd->name, state->cmd->abbr, + state->cmd->usage ? state->cmd->usage : ""); + + linestart = " "; + } fprintf(stderr, "parameters:\n"); fprintf(stderr, " \t -h print this help\n"); @@ -233,15 +259,19 @@ int handle_sys_setting(struct state *state, int argc, char **argv) return EXIT_FAILURE; } - /* if the specified interface is a VLAN then change the path to point - * to the proper "vlan%{vid}" subfolder in the sysfs tree. - */ - if (state->vid >= 0) - snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, - state->mesh_iface, state->vid); - else + switch (state->selector) { + case SP_NONE_OR_MESHIF: snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, state->mesh_iface); + break; + case SP_VLAN: + /* if the specified interface is a VLAN then change the path to + * point to the proper "vlan%{vid}" subfolder in the sysfs tree. + */ + snprintf(path_buff, PATH_BUFF_LEN, SYS_VLAN_PATH, + state->mesh_iface, state->vid); + break; + } if (argc == 1) { res = sys_read_setting(state, path_buff, settings->sysfs_name);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits