commits November 2018

commits@lists.open-mesh.org

1 participants
87 discussions

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit cb8e67d31422c00a1f47b29289cdd6d27bc2f2ce Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:28 2018 +0200 batctl: Move originators debug table to own file The netlink.c file contains to many different functions and mixes helper functions with actual command implementations. The debug table commands should be placed in separate files to better group the command specific code sections together. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- cb8e67d31422c00a1f47b29289cdd6d27bc2f2ce Makefile | 1 + debug.c | 11 --- netlink.c | 175 -------------------------------------------- netlink.h | 2 - originators.c | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 228 insertions(+), 188 deletions(-) diff --git a/Makefile b/Makefile index d447663..059c602 100755 --- a/Makefile +++ b/Makefile @@ -53,6 +53,7 @@ OBJ += nc_nodes.o OBJ += neighbors.o OBJ += netlink.o OBJ += ping.o +OBJ += originators.o OBJ += routing_algo.o OBJ += statistics.o OBJ += sys.o diff --git a/debug.c b/debug.c index a5e7276..f4cc2ea 100644 --- a/debug.c +++ b/debug.c @@ -200,17 +200,6 @@ int debug_print_routing_algos(void) return read_file(full_path, DEBUG_ROUTING_ALGOS, 0, 0, 0, 0); } -static struct debug_table_data batctl_debug_table_originators = { - .debugfs_name = "originators", - .header_lines = 2, - .netlink_fn = netlink_print_originators, - .option_watch_interval = 1, - .option_orig_iface = 1, -}; - -COMMAND_NAMED(DEBUGTABLE, originators, "o", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_originators, ""); - static struct debug_table_data batctl_debug_table_translocal = { .debugfs_name = "transtable_local", .header_lines = 2, diff --git a/netlink.c b/netlink.c index 7735cb6..cbb73ac 100644 --- a/netlink.c +++ b/netlink.c @@ -456,145 +456,6 @@ err_free_sock: return last_err; } -static const int originators_mandatory[] = { - BATADV_ATTR_ORIG_ADDRESS, - BATADV_ATTR_NEIGH_ADDRESS, - BATADV_ATTR_HARD_IFINDEX, - BATADV_ATTR_LAST_SEEN_MSECS, -}; - -static int originators_callback(struct nl_msg *msg, void *arg) -{ - unsigned throughput_mbits, throughput_kbits; - struct nlattr *attrs[BATADV_ATTR_MAX+1]; - struct nlmsghdr *nlh = nlmsg_hdr(msg); - int last_seen_msecs, last_seen_secs; - struct print_opts *opts = arg; - struct bat_host *bat_host; - struct genlmsghdr *ghdr; - char ifname[IF_NAMESIZE]; - float last_seen; - uint8_t *neigh; - uint8_t *orig; - char c = ' '; - uint8_t tq; - - if (!genlmsg_valid_hdr(nlh, 0)) { - fputs("Received invalid data from kernel.\n", stderr); - exit(1); - } - - ghdr = nlmsg_data(nlh); - - if (ghdr->cmd != BATADV_CMD_GET_ORIGINATORS) - return NL_OK; - - if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), - genlmsg_len(ghdr), batadv_netlink_policy)) { - fputs("Received invalid data from kernel.\n", stderr); - exit(1); - } - - if (missing_mandatory_attrs(attrs, originators_mandatory, - ARRAY_SIZE(originators_mandatory))) { - fputs("Missing attributes from kernel\n", stderr); - exit(1); - } - - orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); - neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); - - if (!if_indextoname(nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]), - ifname)) - ifname[0] = '\0'; - - if (attrs[BATADV_ATTR_FLAG_BEST]) - c = '*'; - - last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); - last_seen = (float)last_seen_msecs / 1000.0; - last_seen_secs = last_seen_msecs / 1000; - last_seen_msecs = last_seen_msecs % 1000; - - /* skip timed out originators */ - if (opts->read_opt & NO_OLD_ORIGS) - if (last_seen > opts->orig_timeout) - return NL_OK; - - if (attrs[BATADV_ATTR_THROUGHPUT]) { - throughput_kbits = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT]); - throughput_mbits = throughput_kbits / 1000; - throughput_kbits = throughput_kbits % 1000; - - if (!(opts->read_opt & USE_BAT_HOSTS)) { - printf(" %c %02x:%02x:%02x:%02x:%02x:%02x %4i.%03is (%9u.%1u) %02x:%02x:%02x:%02x:%02x:%02x [%10s]\n", - c, - orig[0], orig[1], orig[2], - orig[3], orig[4], orig[5], - last_seen_secs, last_seen_msecs, - throughput_mbits, throughput_kbits / 100, - neigh[0], neigh[1], neigh[2], - neigh[3], neigh[4], neigh[5], - ifname); - } else { - bat_host = bat_hosts_find_by_mac((char *)orig); - if (bat_host) - printf(" %c %17s ", c, bat_host->name); - else - printf(" %c %02x:%02x:%02x:%02x:%02x:%02x ", - c, - orig[0], orig[1], orig[2], - orig[3], orig[4], orig[5]); - printf("%4i.%03is (%9u.%1u) ", - last_seen_secs, last_seen_msecs, - throughput_mbits, throughput_kbits / 100); - bat_host = bat_hosts_find_by_mac((char *)neigh); - if (bat_host) - printf(" %c %17s ", c, bat_host->name); - else - printf(" %02x:%02x:%02x:%02x:%02x:%02x ", - neigh[0], neigh[1], neigh[2], - neigh[3], neigh[4], neigh[5]); - printf("[%10s]\n", ifname); - } - } - if (attrs[BATADV_ATTR_TQ]) { - tq = nla_get_u8(attrs[BATADV_ATTR_TQ]); - - if (!(opts->read_opt & USE_BAT_HOSTS)) { - printf(" %c %02x:%02x:%02x:%02x:%02x:%02x %4i.%03is (%3i) %02x:%02x:%02x:%02x:%02x:%02x [%10s]\n", - c, - orig[0], orig[1], orig[2], - orig[3], orig[4], orig[5], - last_seen_secs, last_seen_msecs, tq, - neigh[0], neigh[1], neigh[2], - neigh[3], neigh[4], neigh[5], - ifname); - } else { - bat_host = bat_hosts_find_by_mac((char *)orig); - if (bat_host) - printf(" %c %17s ", c, bat_host->name); - else - printf(" %c %02x:%02x:%02x:%02x:%02x:%02x ", - c, - orig[0], orig[1], orig[2], - orig[3], orig[4], orig[5]); - printf("%4i.%03is (%3i) ", - last_seen_secs, last_seen_msecs, tq); - bat_host = bat_hosts_find_by_mac((char *)neigh); - if (bat_host) - printf("%17s ", bat_host->name); - else - printf("%02x:%02x:%02x:%02x:%02x:%02x ", - neigh[0], neigh[1], neigh[2], - neigh[3], neigh[4], neigh[5]); - printf("[%10s]\n", ifname); - } - } - - return NL_OK; -} - static const int transglobal_mandatory[] = { BATADV_ATTR_TT_ADDRESS, BATADV_ATTR_ORIG_ADDRESS, @@ -899,42 +760,6 @@ err_free_sock: return last_err; } -int netlink_print_originators(char *mesh_iface, char *orig_iface, - int read_opts, float orig_timeout, - float watch_interval) -{ - char *header = NULL; - char *info_header; - int ifindex; - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - fprintf(stderr, "Interface %s is unknown\n", mesh_iface); - return -ENODEV; - } - - /* only parse routing algorithm name */ - last_err = -EINVAL; - info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); - free(info_header); - - if (strlen(algo_name_buf) == 0) - return last_err; - - if (!strcmp("BATMAN_IV", algo_name_buf)) - header = " Originator last-seen (#/255) Nexthop [outgoingIF]\n"; - if (!strcmp("BATMAN_V", algo_name_buf)) - header = " Originator last-seen ( throughput) Nexthop [outgoingIF]\n"; - - if (!header) - return -EINVAL; - - return netlink_print_common(mesh_iface, orig_iface, read_opts, - orig_timeout, watch_interval, header, - BATADV_CMD_GET_ORIGINATORS, - originators_callback); -} - int netlink_print_transglobal(char *mesh_iface, char *orig_iface, int read_opts, float orig_timeout, float watch_interval) diff --git a/netlink.h b/netlink.h index bfac3a5..a099482 100644 --- a/netlink.h +++ b/netlink.h @@ -40,8 +40,6 @@ struct print_opts { struct ether_addr; int netlink_print_routing_algos(void); -int netlink_print_originators(char *mesh_iface, char *orig_iface, int read_opt, - float orig_timeout, float watch_interval); int netlink_print_transglobal(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opt, diff --git a/originators.c b/originators.c new file mode 100644 index 0000000..54526e3 --- /dev/null +++ b/originators.c @@ -0,0 +1,227 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: + * + * Andrew Lunn <andrew(a)lunn.ch> + * Sven Eckelmann <sven(a)narfation.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include <errno.h> +#include <net/if.h> +#include <netinet/if_ether.h> +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <string.h> + +#include "batadv_packet.h" +#include "batman_adv.h" +#include "bat-hosts.h" +#include "debug.h" +#include "functions.h" +#include "main.h" +#include "netlink.h" + +static const int originators_mandatory[] = { + BATADV_ATTR_ORIG_ADDRESS, + BATADV_ATTR_NEIGH_ADDRESS, + BATADV_ATTR_HARD_IFINDEX, + BATADV_ATTR_LAST_SEEN_MSECS, +}; + +static int originators_callback(struct nl_msg *msg, void *arg) +{ + unsigned throughput_mbits, throughput_kbits; + struct nlattr *attrs[BATADV_ATTR_MAX+1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + int last_seen_msecs, last_seen_secs; + struct print_opts *opts = arg; + struct bat_host *bat_host; + struct genlmsghdr *ghdr; + char ifname[IF_NAMESIZE]; + float last_seen; + uint8_t *neigh; + uint8_t *orig; + char c = ' '; + uint8_t tq; + + if (!genlmsg_valid_hdr(nlh, 0)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + ghdr = nlmsg_data(nlh); + + if (ghdr->cmd != BATADV_CMD_GET_ORIGINATORS) + return NL_OK; + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + if (missing_mandatory_attrs(attrs, originators_mandatory, + ARRAY_SIZE(originators_mandatory))) { + fputs("Missing attributes from kernel\n", stderr); + exit(1); + } + + orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); + neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); + + if (!if_indextoname(nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]), + ifname)) + ifname[0] = '\0'; + + if (attrs[BATADV_ATTR_FLAG_BEST]) + c = '*'; + + last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); + last_seen = (float)last_seen_msecs / 1000.0; + last_seen_secs = last_seen_msecs / 1000; + last_seen_msecs = last_seen_msecs % 1000; + + /* skip timed out originators */ + if (opts->read_opt & NO_OLD_ORIGS) + if (last_seen > opts->orig_timeout) + return NL_OK; + + if (attrs[BATADV_ATTR_THROUGHPUT]) { + throughput_kbits = nla_get_u32(attrs[BATADV_ATTR_THROUGHPUT]); + throughput_mbits = throughput_kbits / 1000; + throughput_kbits = throughput_kbits % 1000; + + if (!(opts->read_opt & USE_BAT_HOSTS)) { + printf(" %c %02x:%02x:%02x:%02x:%02x:%02x %4i.%03is (%9u.%1u) %02x:%02x:%02x:%02x:%02x:%02x [%10s]\n", + c, + orig[0], orig[1], orig[2], + orig[3], orig[4], orig[5], + last_seen_secs, last_seen_msecs, + throughput_mbits, throughput_kbits / 100, + neigh[0], neigh[1], neigh[2], + neigh[3], neigh[4], neigh[5], + ifname); + } else { + bat_host = bat_hosts_find_by_mac((char *)orig); + if (bat_host) + printf(" %c %17s ", c, bat_host->name); + else + printf(" %c %02x:%02x:%02x:%02x:%02x:%02x ", + c, + orig[0], orig[1], orig[2], + orig[3], orig[4], orig[5]); + printf("%4i.%03is (%9u.%1u) ", + last_seen_secs, last_seen_msecs, + throughput_mbits, throughput_kbits / 100); + bat_host = bat_hosts_find_by_mac((char *)neigh); + if (bat_host) + printf(" %c %17s ", c, bat_host->name); + else + printf(" %02x:%02x:%02x:%02x:%02x:%02x ", + neigh[0], neigh[1], neigh[2], + neigh[3], neigh[4], neigh[5]); + printf("[%10s]\n", ifname); + } + } + if (attrs[BATADV_ATTR_TQ]) { + tq = nla_get_u8(attrs[BATADV_ATTR_TQ]); + + if (!(opts->read_opt & USE_BAT_HOSTS)) { + printf(" %c %02x:%02x:%02x:%02x:%02x:%02x %4i.%03is (%3i) %02x:%02x:%02x:%02x:%02x:%02x [%10s]\n", + c, + orig[0], orig[1], orig[2], + orig[3], orig[4], orig[5], + last_seen_secs, last_seen_msecs, tq, + neigh[0], neigh[1], neigh[2], + neigh[3], neigh[4], neigh[5], + ifname); + } else { + bat_host = bat_hosts_find_by_mac((char *)orig); + if (bat_host) + printf(" %c %17s ", c, bat_host->name); + else + printf(" %c %02x:%02x:%02x:%02x:%02x:%02x ", + c, + orig[0], orig[1], orig[2], + orig[3], orig[4], orig[5]); + printf("%4i.%03is (%3i) ", + last_seen_secs, last_seen_msecs, tq); + bat_host = bat_hosts_find_by_mac((char *)neigh); + if (bat_host) + printf("%17s ", bat_host->name); + else + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + neigh[0], neigh[1], neigh[2], + neigh[3], neigh[4], neigh[5]); + printf("[%10s]\n", ifname); + } + } + + return NL_OK; +} + +static int netlink_print_originators(char *mesh_iface, char *orig_iface, + int read_opts, float orig_timeout, + float watch_interval) +{ + char *header = NULL; + char *info_header; + int ifindex; + + ifindex = if_nametoindex(mesh_iface); + if (!ifindex) { + fprintf(stderr, "Interface %s is unknown\n", mesh_iface); + return -ENODEV; + } + + /* only parse routing algorithm name */ + last_err = -EINVAL; + info_header = netlink_get_info(ifindex, BATADV_CMD_GET_ORIGINATORS, NULL); + free(info_header); + + if (strlen(algo_name_buf) == 0) + return last_err; + + if (!strcmp("BATMAN_IV", algo_name_buf)) + header = " Originator last-seen (#/255) Nexthop [outgoingIF]\n"; + if (!strcmp("BATMAN_V", algo_name_buf)) + header = " Originator last-seen ( throughput) Nexthop [outgoingIF]\n"; + + if (!header) + return -EINVAL; + + return netlink_print_common(mesh_iface, orig_iface, read_opts, + orig_timeout, watch_interval, header, + BATADV_CMD_GET_ORIGINATORS, + originators_callback); +} + +static struct debug_table_data batctl_debug_table_originators = { + .debugfs_name = "originators", + .header_lines = 2, + .netlink_fn = netlink_print_originators, + .option_watch_interval = 1, + .option_orig_iface = 1, +}; + +COMMAND_NAMED(DEBUGTABLE, originators, "o", handle_debug_table, + COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_originators, "");

1 0

[batctl] master: batctl: Allow to enable/disable subcommands (2f5dbd0)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 2f5dbd056b8be344b5492835b0924f6cf463ba4d Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:45 2018 +0200 batctl: Allow to enable/disable subcommands Systems with limited space are usually not using all the functionality of batman-adv and of batctl. Still, most of the batctl is still build even when the corresponding batman-adv functionality would not be available. This becomes especially important for subcommands which implement most functionality in userspace when it was previously completely handled by the kernel. An external build system for such system can now just select the commands it really needs. Combining this with link-time-optimizationa and/or function/data-section garbage collection allows to find the right mix between size and functionality. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2f5dbd056b8be344b5492835b0924f6cf463ba4d Makefile | 83 +++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index dfcfbd9..e6b2412 100755 --- a/Makefile +++ b/Makefile @@ -20,56 +20,69 @@ # # License-Filename: LICENSES/preferred/GPL-2.0 -# changing the CONFIG_* line to 'y' enables the related feature -# batctl advanced debugging tool bisect: +# just for backward compatibility - please use CONFIG_bisect_iv instead export CONFIG_BATCTL_BISECT=n # batctl build BINARY_NAME = batctl -obj-y += aggregation.o -obj-y += ap_isolation.o obj-y += bat-hosts.o -obj-y += backbonetable.o -obj-$(CONFIG_BATCTL_BISECT) += bisect_iv.o -obj-y += bonding.o -obj-y += bridge_loop_avoidance.o -obj-y += claimtable.o -obj-y += dat_cache.o obj-y += debugfs.o obj-y += debug.o -obj-y += distributed_arp_table.o -obj-y += event.o -obj-y += fragmentation.o obj-y += functions.o -obj-y += gateways.o obj-y += genl.o -obj-y += gw_mode.o obj-y += hash.o obj-y += icmp_helper.o -obj-y += interface.o -obj-y += isolation_mark.o -obj-y += loglevel.o -obj-y += log.o obj-y += main.o -obj-y += mcast_flags.o -obj-y += multicast_mode.o -obj-y += nc_nodes.o -obj-y += neighbors.o obj-y += netlink.o -obj-y += network_coding.o -obj-y += ping.o -obj-y += originators.o -obj-y += orig_interval.o -obj-y += routing_algo.o -obj-y += statistics.o obj-y += sys.o -obj-y += tcpdump.o -obj-y += throughputmeter.o -obj-y += traceroute.o -obj-y += transglobal.o -obj-y += translate.o -obj-y += translocal.o + +define add_command + CONFIG_$(1):=$(2) + ifneq ($$(CONFIG_$(1)),y) + ifneq ($$(CONFIG_$(1)),n) + $$(warning invalid value for parameter CONFIG_$(1): $$(CONFIG_$(1))) + endif + endif + + obj-$$(CONFIG_$(1)) += $(1).o +endef # add_command + +# using the make parameter CONFIG_* (e.g. CONFIG_bisect_iv) with the value 'y' +# enables the related feature and 'n' disables it +$(eval $(call add_command,aggregation,y)) +$(eval $(call add_command,ap_isolation,y)) +$(eval $(call add_command,backbonetable,y)) +$(eval $(call add_command,bisect_iv,$(CONFIG_BATCTL_BISECT))) +$(eval $(call add_command,bonding,y)) +$(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,event,y)) +$(eval $(call add_command,fragmentation,y)) +$(eval $(call add_command,gateways,y)) +$(eval $(call add_command,gw_mode,y)) +$(eval $(call add_command,interface,y)) +$(eval $(call add_command,isolation_mark,y)) +$(eval $(call add_command,log,y)) +$(eval $(call add_command,loglevel,y)) +$(eval $(call add_command,mcast_flags,y)) +$(eval $(call add_command,multicast_mode,y)) +$(eval $(call add_command,nc_nodes,y)) +$(eval $(call add_command,neighbors,y)) +$(eval $(call add_command,network_coding,y)) +$(eval $(call add_command,orig_interval,y)) +$(eval $(call add_command,originators,y)) +$(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,throughputmeter,y)) +$(eval $(call add_command,traceroute,y)) +$(eval $(call add_command,transglobal,y)) +$(eval $(call add_command,translate,y)) +$(eval $(call add_command,translocal,y)) MANPAGE = man/batctl.8

1 0

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 1203ba6d8920934134eac2fa0f133e25d47a79f5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:32 2018 +0200 batctl: Move ap_isolation setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1203ba6d8920934134eac2fa0f133e25d47a79f5 Makefile | 1 + aggregation.c => ap_isolation.c | 12 ++++++------ sys.c | 9 --------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index dfc59af..0a72595 100755 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ BINARY_NAME = batctl OBJ_BISECT = bisect_iv.o OBJ += aggregation.o +OBJ += ap_isolation.o OBJ += bat-hosts.o OBJ += backbonetable.o ifeq ($(CONFIG_BATCTL_BISECT),y) diff --git a/aggregation.c b/ap_isolation.c similarity index 72% copy from aggregation.c copy to ap_isolation.c index 57c1dbb..2d16c68 100644 --- a/aggregation.c +++ b/ap_isolation.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * - * Marek Lindner <mareklindner(a)neomailbox.ch> + * 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 @@ -23,11 +23,11 @@ #include "main.h" #include "sys.h" -static struct settings_data batctl_settings_aggregation = { - .sysfs_name = "aggregated_ogms", +static struct settings_data batctl_settings_ap_isolation = { + .sysfs_name = "ap_isolation", .params = sysfs_param_enable, }; -COMMAND_NAMED(SUBCOMMAND, aggregation, "ag", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_aggregation, - "[0|1] \tdisplay or modify aggregation setting"); +COMMAND_NAMED(SUBCOMMAND, ap_isolation, "ap", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_ap_isolation, + "[0|1] \tdisplay or modify ap_isolation setting"); diff --git a/sys.c b/sys.c index 00e452c..80d9fa1 100644 --- a/sys.c +++ b/sys.c @@ -146,15 +146,6 @@ COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval, "[interval] \tdisplay or modify orig_interval setting"); -static struct settings_data batctl_settings_ap_isolation = { - .sysfs_name = "ap_isolation", - .params = sysfs_param_enable, -}; - -COMMAND_NAMED(SUBCOMMAND, ap_isolation, "ap", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_ap_isolation, - "[0|1] \tdisplay or modify ap_isolation setting"); - static struct settings_data batctl_settings_bridge_loop_avoidance = { .sysfs_name = SYS_BLA, .params = sysfs_param_enable,

1 0

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit bdeff8d437e06f4009a212d1022a3250a72f9062 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:25 2018 +0200 batctl: Move mcast_flags debug table to own file The netlink.c file contains to many different functions and mixes helper functions with actual command implementations. The debug table commands should be placed in separate files to better group the command specific code sections together. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- bdeff8d437e06f4009a212d1022a3250a72f9062 Makefile | 1 + debug.c | 9 --- gateways.c | 3 +- mcast_flags.c | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ netlink.c | 133 +------------------------------------------ netlink.h | 5 +- 6 files changed, 186 insertions(+), 144 deletions(-) diff --git a/Makefile b/Makefile index 3a8e785..a725986 100755 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ OBJ += interface.o OBJ += loglevel.o OBJ += log.o OBJ += main.o +OBJ += mcast_flags.o OBJ += netlink.o OBJ += ping.o OBJ += routing_algo.o diff --git a/debug.c b/debug.c index 7bf8bff..4b480a3 100644 --- a/debug.c +++ b/debug.c @@ -249,12 +249,3 @@ static struct debug_table_data batctl_debug_table_nc_nodes = { COMMAND_NAMED(DEBUGTABLE, nc_nodes, "nn", handle_debug_table, COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_nc_nodes, ""); - -static struct debug_table_data batctl_debug_table_mcast_flags = { - .debugfs_name = DEBUG_MCAST_FLAGS, - .header_lines = 6, - .netlink_fn = netlink_print_mcast_flags, -}; - -COMMAND_NAMED(DEBUGTABLE, mcast_flags, "mf", handle_debug_table, - COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_mcast_flags, ""); diff --git a/gateways.c b/gateways.c index f81bf20..ca5d6ec 100644 --- a/gateways.c +++ b/gateways.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * - * Andrew Lunn <andrew(a)lunn.ch> - * Sven Eckelmann <sven(a)narfation.org> + * Linus Lüssing <linus.luessing(a)c0d3.blue> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/mcast_flags.c b/mcast_flags.c new file mode 100644 index 0000000..e35cce3 --- /dev/null +++ b/mcast_flags.c @@ -0,0 +1,179 @@ +// 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 <errno.h> +#include <net/if.h> +#include <netinet/if_ether.h> +#include <netlink/netlink.h> +#include <netlink/genl/genl.h> +#include <netlink/genl/ctrl.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> + +#include "batadv_packet.h" +#include "batman_adv.h" +#include "bat-hosts.h" +#include "debug.h" +#include "functions.h" +#include "main.h" +#include "netlink.h" + +static const int mcast_flags_mandatory[] = { + BATADV_ATTR_ORIG_ADDRESS, +}; + +static int mcast_flags_callback(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX+1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct print_opts *opts = arg; + struct bat_host *bat_host; + struct genlmsghdr *ghdr; + uint32_t flags; + uint8_t *addr; + + if (!genlmsg_valid_hdr(nlh, 0)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + ghdr = nlmsg_data(nlh); + + if (ghdr->cmd != BATADV_CMD_GET_MCAST_FLAGS) + return NL_OK; + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + if (missing_mandatory_attrs(attrs, mcast_flags_mandatory, + ARRAY_SIZE(mcast_flags_mandatory))) { + fputs("Missing attributes from kernel\n", stderr); + exit(1); + } + + addr = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); + + if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01)) + return NL_OK; + + if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01)) + return NL_OK; + + bat_host = bat_hosts_find_by_mac((char *)addr); + if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) + printf("%02x:%02x:%02x:%02x:%02x:%02x ", + addr[0], addr[1], addr[2], + addr[3], addr[4], addr[5]); + else + printf("%17s ", bat_host->name); + + if (attrs[BATADV_ATTR_MCAST_FLAGS]) { + flags = nla_get_u32(attrs[BATADV_ATTR_MCAST_FLAGS]); + + printf("[%c%c%c]\n", + flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.', + flags & BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.', + flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.'); + } else { + printf("-\n"); + } + + return NL_OK; +} + +static int netlink_print_mcast_flags(char *mesh_iface, char *orig_iface, + int read_opts, float orig_timeout, + float watch_interval) +{ + char querier4, querier6, shadowing4, shadowing6; + char *info_header; + char *header; + bool bridged; + int ifindex; + int ret; + + ifindex = if_nametoindex(mesh_iface); + if (!ifindex) { + fprintf(stderr, "Interface %s is unknown\n", mesh_iface); + return -ENODEV; + } + + /* only parse own multicast flags */ + info_header = netlink_get_info(ifindex, BATADV_CMD_GET_MCAST_FLAGS, NULL); + free(info_header); + + if (mcast_flags == -EOPNOTSUPP || mcast_flags_priv == -EOPNOTSUPP) + return -EOPNOTSUPP; + + bridged = mcast_flags_priv & BATADV_MCAST_FLAGS_BRIDGED; + + if (bridged) { + querier4 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS) ? '.' : '4'; + querier6 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS) ? '.' : '6'; + shadowing4 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING) ? '4' : '.'; + shadowing6 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING) ? '6' : '.'; + } else { + querier4 = '?'; + querier6 = '?'; + shadowing4 = '?'; + shadowing6 = '?'; + } + + ret = asprintf(&header, + "Multicast flags (own flags: [%c%c%c])\n" + "* Bridged [U]\t\t\t\t%c\n" + "* No IGMP/MLD Querier [4/6]:\t\t%c/%c\n" + "* Shadowing IGMP/MLD Querier [4/6]:\t%c/%c\n" + "-------------------------------------------\n" + " %-10s %s\n", + (mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES) ? 'U' : '.', + (mcast_flags & BATADV_MCAST_WANT_ALL_IPV4) ? '4' : '.', + (mcast_flags & BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.', + bridged ? 'U' : '.', + querier4, querier6, shadowing4, shadowing6, + "Originator", "Flags"); + + if (ret < 0) + return ret; + + ret = netlink_print_common(mesh_iface, orig_iface, read_opts, + orig_timeout, watch_interval, header, + BATADV_CMD_GET_MCAST_FLAGS, + mcast_flags_callback); + + free(header); + return ret; +} + +static struct debug_table_data batctl_debug_table_mcast_flags = { + .debugfs_name = DEBUG_MCAST_FLAGS, + .header_lines = 6, + .netlink_fn = netlink_print_mcast_flags, +}; + +COMMAND_NAMED(DEBUGTABLE, mcast_flags, "mf", handle_debug_table, + COMMAND_FLAG_MESH_IFACE, &batctl_debug_table_mcast_flags, ""); diff --git a/netlink.c b/netlink.c index c3b2bad..4f2199e 100644 --- a/netlink.c +++ b/netlink.c @@ -111,8 +111,8 @@ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { int last_err; char algo_name_buf[256] = ""; -static int64_t mcast_flags = -EOPNOTSUPP; -static int64_t mcast_flags_priv = -EOPNOTSUPP; +int64_t mcast_flags = -EOPNOTSUPP; +int64_t mcast_flags_priv = -EOPNOTSUPP; int missing_mandatory_attrs(struct nlattr *attrs[], const int mandatory[], int num) @@ -876,72 +876,6 @@ static int translocal_callback(struct nl_msg *msg, void *arg) return NL_OK; } -static const int mcast_flags_mandatory[] = { - BATADV_ATTR_ORIG_ADDRESS, -}; - -static int mcast_flags_callback(struct nl_msg *msg, void *arg) -{ - struct nlattr *attrs[BATADV_ATTR_MAX+1]; - struct nlmsghdr *nlh = nlmsg_hdr(msg); - struct print_opts *opts = arg; - struct bat_host *bat_host; - struct genlmsghdr *ghdr; - uint32_t flags; - uint8_t *addr; - - if (!genlmsg_valid_hdr(nlh, 0)) { - fputs("Received invalid data from kernel.\n", stderr); - exit(1); - } - - ghdr = nlmsg_data(nlh); - - if (ghdr->cmd != BATADV_CMD_GET_MCAST_FLAGS) - return NL_OK; - - if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), - genlmsg_len(ghdr), batadv_netlink_policy)) { - fputs("Received invalid data from kernel.\n", stderr); - exit(1); - } - - if (missing_mandatory_attrs(attrs, mcast_flags_mandatory, - ARRAY_SIZE(mcast_flags_mandatory))) { - fputs("Missing attributes from kernel\n", stderr); - exit(1); - } - - addr = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); - - if (opts->read_opt & MULTICAST_ONLY && !(addr[0] & 0x01)) - return NL_OK; - - if (opts->read_opt & UNICAST_ONLY && (addr[0] & 0x01)) - return NL_OK; - - bat_host = bat_hosts_find_by_mac((char *)addr); - if (!(opts->read_opt & USE_BAT_HOSTS) || !bat_host) - printf("%02x:%02x:%02x:%02x:%02x:%02x ", - addr[0], addr[1], addr[2], - addr[3], addr[4], addr[5]); - else - printf("%17s ", bat_host->name); - - if (attrs[BATADV_ATTR_MCAST_FLAGS]) { - flags = nla_get_u32(attrs[BATADV_ATTR_MCAST_FLAGS]); - - printf("[%c%c%c]\n", - flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.', - flags & BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.', - flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.'); - } else { - printf("-\n"); - } - - return NL_OK; -} - int netlink_print_common(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval, const char *header, uint8_t nl_cmd, @@ -1117,69 +1051,6 @@ int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opts, translocal_callback); } -int netlink_print_mcast_flags(char *mesh_iface, char *orig_iface, int read_opts, - float orig_timeout, float watch_interval) -{ - char querier4, querier6, shadowing4, shadowing6; - char *info_header; - char *header; - bool bridged; - int ifindex; - int ret; - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - fprintf(stderr, "Interface %s is unknown\n", mesh_iface); - return -ENODEV; - } - - /* only parse own multicast flags */ - info_header = netlink_get_info(ifindex, BATADV_CMD_GET_MCAST_FLAGS, NULL); - free(info_header); - - if (mcast_flags == -EOPNOTSUPP || mcast_flags_priv == -EOPNOTSUPP) - return -EOPNOTSUPP; - - bridged = mcast_flags_priv & BATADV_MCAST_FLAGS_BRIDGED; - - if (bridged) { - querier4 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS) ? '.' : '4'; - querier6 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS) ? '.' : '6'; - shadowing4 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING) ? '4' : '.'; - shadowing6 = (mcast_flags_priv & BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING) ? '6' : '.'; - } else { - querier4 = '?'; - querier6 = '?'; - shadowing4 = '?'; - shadowing6 = '?'; - } - - ret = asprintf(&header, - "Multicast flags (own flags: [%c%c%c])\n" - "* Bridged [U]\t\t\t\t%c\n" - "* No IGMP/MLD Querier [4/6]:\t\t%c/%c\n" - "* Shadowing IGMP/MLD Querier [4/6]:\t%c/%c\n" - "-------------------------------------------\n" - " %-10s %s\n", - (mcast_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES) ? 'U' : '.', - (mcast_flags & BATADV_MCAST_WANT_ALL_IPV4) ? '4' : '.', - (mcast_flags & BATADV_MCAST_WANT_ALL_IPV6) ? '6' : '.', - bridged ? 'U' : '.', - querier4, querier6, shadowing4, shadowing6, - "Originator", "Flags"); - - if (ret < 0) - return ret; - - ret = netlink_print_common(mesh_iface, orig_iface, read_opts, - orig_timeout, watch_interval, header, - BATADV_CMD_GET_MCAST_FLAGS, - mcast_flags_callback); - - free(header); - return ret; -} - static int nlquery_error_cb(struct sockaddr_nl *nla __maybe_unused, struct nlmsgerr *nlerr, void *arg) { diff --git a/netlink.h b/netlink.h index ecf4b01..e0fa466 100644 --- a/netlink.h +++ b/netlink.h @@ -25,6 +25,7 @@ #include <netlink/genl/genl.h> #include <netlink/genl/ctrl.h> +#include <stdint.h> struct print_opts { int read_opt; @@ -47,8 +48,6 @@ int netlink_print_transglobal(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); int netlink_print_translocal(char *mesh_iface, char *orig_iface, int read_opt, float orig_timeout, float watch_interval); -int netlink_print_mcast_flags(char *mesh_iface, char *orig_iface, int read_opt, - float orig_timeout, float watch_interval); char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header); int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, @@ -68,5 +67,7 @@ int netlink_print_common(char *mesh_iface, char *orig_iface, int read_opt, extern char algo_name_buf[256]; extern int last_err; +extern int64_t mcast_flags; +extern int64_t mcast_flags_priv; #endif /* _BATCTL_NETLINK_H */

1 0

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit be1b94761c518eca7e4a917a9e94f06ec25b5b76 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:35 2018 +0200 batctl: Move distributed_arp_table setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- be1b94761c518eca7e4a917a9e94f06ec25b5b76 Makefile | 1 + ap_isolation.c => distributed_arp_table.c | 10 +++++----- sys.c | 9 --------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 6664aa0..9cbef82 100755 --- a/Makefile +++ b/Makefile @@ -42,6 +42,7 @@ OBJ += claimtable.o OBJ += dat_cache.o OBJ += debugfs.o OBJ += debug.o +OBJ += distributed_arp_table.o OBJ += functions.o OBJ += gateways.o OBJ += genl.o diff --git a/ap_isolation.c b/distributed_arp_table.c similarity index 74% copy from ap_isolation.c copy to distributed_arp_table.c index 2d16c68..ba6e5b7 100644 --- a/ap_isolation.c +++ b/distributed_arp_table.c @@ -23,11 +23,11 @@ #include "main.h" #include "sys.h" -static struct settings_data batctl_settings_ap_isolation = { - .sysfs_name = "ap_isolation", +static struct settings_data batctl_settings_distributed_arp_table = { + .sysfs_name = SYS_DAT, .params = sysfs_param_enable, }; -COMMAND_NAMED(SUBCOMMAND, ap_isolation, "ap", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_ap_isolation, - "[0|1] \tdisplay or modify ap_isolation setting"); +COMMAND_NAMED(SUBCOMMAND, distributed_arp_table, "dat", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_distributed_arp_table, + "[0|1] \tdisplay or modify distributed_arp_table setting"); diff --git a/sys.c b/sys.c index e08738d..9ce7a90 100644 --- a/sys.c +++ b/sys.c @@ -146,15 +146,6 @@ COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval, "[interval] \tdisplay or modify orig_interval setting"); -static struct settings_data batctl_settings_distributed_arp_table = { - .sysfs_name = SYS_DAT, - .params = sysfs_param_enable, -}; - -COMMAND_NAMED(SUBCOMMAND, distributed_arp_table, "dat", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_distributed_arp_table, - "[0|1] \tdisplay or modify distributed_arp_table setting"); - static struct settings_data batctl_settings_fragmentation = { .sysfs_name = "fragmentation", .params = sysfs_param_enable,

1 0

[batctl] master: batctl: Simplify enabling for bisect_iv subcommand (6b7abf8)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 6b7abf8eb6eeaa4a537caa54fbe3a7e10724471b Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:44 2018 +0200 batctl: Simplify enabling for bisect_iv subcommand The variable content of CONFIG_BATCTL_BISECT can be used to decide whether the bisect_iv command is enabled or not. This would make it possible in the future to introduce a generic way to enable or disable commands. Combining this with link-time-optimization and/or function/data-section allows to relatively freely scale the functionality of batctl and its size. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6b7abf8eb6eeaa4a537caa54fbe3a7e10724471b Makefile | 96 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index cf2b1c7..dfcfbd9 100755 --- a/Makefile +++ b/Makefile @@ -27,53 +27,49 @@ export CONFIG_BATCTL_BISECT=n # batctl build BINARY_NAME = batctl -OBJ_BISECT = bisect_iv.o - -OBJ += aggregation.o -OBJ += ap_isolation.o -OBJ += bat-hosts.o -OBJ += backbonetable.o -ifeq ($(CONFIG_BATCTL_BISECT),y) -OBJ += $(OBJ_BISECT) -endif -OBJ += bonding.o -OBJ += bridge_loop_avoidance.o -OBJ += claimtable.o -OBJ += dat_cache.o -OBJ += debugfs.o -OBJ += debug.o -OBJ += distributed_arp_table.o -OBJ += event.o -OBJ += fragmentation.o -OBJ += functions.o -OBJ += gateways.o -OBJ += genl.o -OBJ += gw_mode.o -OBJ += hash.o -OBJ += icmp_helper.o -OBJ += interface.o -OBJ += isolation_mark.o -OBJ += loglevel.o -OBJ += log.o -OBJ += main.o -OBJ += mcast_flags.o -OBJ += multicast_mode.o -OBJ += nc_nodes.o -OBJ += neighbors.o -OBJ += netlink.o -OBJ += network_coding.o -OBJ += ping.o -OBJ += originators.o -OBJ += orig_interval.o -OBJ += routing_algo.o -OBJ += statistics.o -OBJ += sys.o -OBJ += tcpdump.o -OBJ += throughputmeter.o -OBJ += traceroute.o -OBJ += transglobal.o -OBJ += translate.o -OBJ += translocal.o +obj-y += aggregation.o +obj-y += ap_isolation.o +obj-y += bat-hosts.o +obj-y += backbonetable.o +obj-$(CONFIG_BATCTL_BISECT) += bisect_iv.o +obj-y += bonding.o +obj-y += bridge_loop_avoidance.o +obj-y += claimtable.o +obj-y += dat_cache.o +obj-y += debugfs.o +obj-y += debug.o +obj-y += distributed_arp_table.o +obj-y += event.o +obj-y += fragmentation.o +obj-y += functions.o +obj-y += gateways.o +obj-y += genl.o +obj-y += gw_mode.o +obj-y += hash.o +obj-y += icmp_helper.o +obj-y += interface.o +obj-y += isolation_mark.o +obj-y += loglevel.o +obj-y += log.o +obj-y += main.o +obj-y += mcast_flags.o +obj-y += multicast_mode.o +obj-y += nc_nodes.o +obj-y += neighbors.o +obj-y += netlink.o +obj-y += network_coding.o +obj-y += ping.o +obj-y += originators.o +obj-y += orig_interval.o +obj-y += routing_algo.o +obj-y += statistics.o +obj-y += sys.o +obj-y += tcpdump.o +obj-y += throughputmeter.o +obj-y += traceroute.o +obj-y += transglobal.o +obj-y += translate.o +obj-y += translocal.o MANPAGE = man/batctl.8 @@ -150,11 +146,11 @@ all: $(BINARY_NAME) .c.o: $(COMPILE.c) -o $@ $< -$(BINARY_NAME): $(OBJ) +$(BINARY_NAME): $(obj-y) $(LINK.o) $^ $(LDLIBS) -o $@ clean: - $(RM) $(BINARY_NAME) $(OBJ) $(OBJ_BISECT) $(DEP) + $(RM) $(BINARY_NAME) $(obj-y) $(obj-n) $(DEP) install: $(BINARY_NAME) $(MKDIR) $(DESTDIR)$(SBINDIR) @@ -163,7 +159,7 @@ install: $(BINARY_NAME) $(INSTALL) -m 0644 $(MANPAGE) $(DESTDIR)$(MANDIR)/man8 # load dependencies -DEP = $(OBJ:.o=.d) $(OBJ_BISECT:.o=.d) +DEP = $(obj-y:.o=.d) $(obj-n:.o=.d) -include $(DEP) .PHONY: all clean install

1 0

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit d6788776ba3cff08a7f4721203633c31b964981b Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:39 2018 +0200 batctl: Move network_coding setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d6788776ba3cff08a7f4721203633c31b964981b Makefile | 1 + multicast_mode.c => network_coding.c | 12 ++++++------ sys.c | 9 --------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 9e5199d..8582bf6 100755 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ OBJ += multicast_mode.o OBJ += nc_nodes.o OBJ += neighbors.o OBJ += netlink.o +OBJ += network_coding.o OBJ += ping.o OBJ += originators.o OBJ += routing_algo.o diff --git a/multicast_mode.c b/network_coding.c similarity index 72% copy from multicast_mode.c copy to network_coding.c index 8542928..a4c4296 100644 --- a/multicast_mode.c +++ b/network_coding.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * - * Linus Lüssing <linus.luessing(a)c0d3.blue> + * Martin Hundebøll <martin(a)hundeboll.net> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -23,11 +23,11 @@ #include "main.h" #include "sys.h" -static struct settings_data batctl_settings_multicast_mode = { - .sysfs_name = SYS_MULTICAST_MODE, +static struct settings_data batctl_settings_network_coding = { + .sysfs_name = SYS_NETWORK_CODING, .params = sysfs_param_enable, }; -COMMAND_NAMED(SUBCOMMAND, multicast_mode, "mm", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_multicast_mode, - "[0|1] \tdisplay or modify multicast_mode setting"); +COMMAND_NAMED(SUBCOMMAND, network_coding, "nc", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_network_coding, + "[0|1] \tdisplay or modify network_coding setting"); diff --git a/sys.c b/sys.c index 80ef3ab..932a7e8 100644 --- a/sys.c +++ b/sys.c @@ -145,12 +145,3 @@ static struct settings_data batctl_settings_orig_interval = { COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval, "[interval] \tdisplay or modify orig_interval setting"); - -static struct settings_data batctl_settings_network_coding = { - .sysfs_name = SYS_NETWORK_CODING, - .params = sysfs_param_enable, -}; - -COMMAND_NAMED(SUBCOMMAND, network_coding, "nc", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_network_coding, - "[0|1] \tdisplay or modify network_coding setting");

1 0

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 33ddb6c04e1b33d43a94620a86f40bbbf873f44e Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:34 2018 +0200 batctl: Move bridge_loop_avoidance setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 33ddb6c04e1b33d43a94620a86f40bbbf873f44e Makefile | 1 + bonding.c => bridge_loop_avoidance.c | 12 ++++++------ sys.c | 9 --------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index c1b8484..6664aa0 100755 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ ifeq ($(CONFIG_BATCTL_BISECT),y) OBJ += $(OBJ_BISECT) endif OBJ += bonding.o +OBJ += bridge_loop_avoidance.o OBJ += claimtable.o OBJ += dat_cache.o OBJ += debugfs.o diff --git a/bonding.c b/bridge_loop_avoidance.c similarity index 70% copy from bonding.c copy to bridge_loop_avoidance.c index f7105c9..0db49f2 100644 --- a/bonding.c +++ b/bridge_loop_avoidance.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) 2009-2018 B.A.T.M.A.N. contributors: * - * Marek Lindner <mareklindner(a)neomailbox.ch> + * Simon Wunderlich <sw(a)simonwunderlich.de> * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -23,11 +23,11 @@ #include "main.h" #include "sys.h" -static struct settings_data batctl_settings_bonding = { - .sysfs_name = "bonding", +static struct settings_data batctl_settings_bridge_loop_avoidance = { + .sysfs_name = SYS_BLA, .params = sysfs_param_enable, }; -COMMAND_NAMED(SUBCOMMAND, bonding, "b", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_bonding, - "[0|1] \tdisplay or modify bonding setting"); +COMMAND_NAMED(SUBCOMMAND, bridge_loop_avoidance, "bl", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_bridge_loop_avoidance, + "[0|1] \tdisplay or modify bridge_loop_avoidance setting"); diff --git a/sys.c b/sys.c index 8ad925e..e08738d 100644 --- a/sys.c +++ b/sys.c @@ -146,15 +146,6 @@ COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval, "[interval] \tdisplay or modify orig_interval setting"); -static struct settings_data batctl_settings_bridge_loop_avoidance = { - .sysfs_name = SYS_BLA, - .params = sysfs_param_enable, -}; - -COMMAND_NAMED(SUBCOMMAND, bridge_loop_avoidance, "bl", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_bridge_loop_avoidance, - "[0|1] \tdisplay or modify bridge_loop_avoidance setting"); - static struct settings_data batctl_settings_distributed_arp_table = { .sysfs_name = SYS_DAT, .params = sysfs_param_enable,

1 0

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 150efb5aa42b0b19665d5bfe38eac830981f4c6e Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:37 2018 +0200 batctl: Move isolation_mark setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 150efb5aa42b0b19665d5bfe38eac830981f4c6e Makefile | 1 + ap_isolation.c => isolation_mark.c | 14 ++++++++------ sys.c | 9 --------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 7f82d44..9598065 100755 --- a/Makefile +++ b/Makefile @@ -51,6 +51,7 @@ OBJ += gw_mode.o OBJ += hash.o OBJ += icmp_helper.o OBJ += interface.o +OBJ += isolation_mark.o OBJ += loglevel.o OBJ += log.o OBJ += main.o diff --git a/ap_isolation.c b/isolation_mark.c similarity index 72% copy from ap_isolation.c copy to isolation_mark.c index 2d16c68..13ba869 100644 --- a/ap_isolation.c +++ b/isolation_mark.c @@ -20,14 +20,16 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ +#include <stddef.h> + #include "main.h" #include "sys.h" -static struct settings_data batctl_settings_ap_isolation = { - .sysfs_name = "ap_isolation", - .params = sysfs_param_enable, +static struct settings_data batctl_settings_isolation_mark = { + .sysfs_name = "isolation_mark", + .params = NULL, }; -COMMAND_NAMED(SUBCOMMAND, ap_isolation, "ap", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_ap_isolation, - "[0|1] \tdisplay or modify ap_isolation setting"); +COMMAND_NAMED(SUBCOMMAND, isolation_mark, "mark", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_isolation_mark, + "[mark] \tdisplay or modify isolation_mark setting"); diff --git a/sys.c b/sys.c index f81298b..355b801 100644 --- a/sys.c +++ b/sys.c @@ -155,15 +155,6 @@ COMMAND_NAMED(SUBCOMMAND, network_coding, "nc", handle_sys_setting, COMMAND_FLAG_MESH_IFACE, &batctl_settings_network_coding, "[0|1] \tdisplay or modify network_coding setting"); -static struct settings_data batctl_settings_isolation_mark = { - .sysfs_name = "isolation_mark", - .params = NULL, -}; - -COMMAND_NAMED(SUBCOMMAND, isolation_mark, "mark", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_isolation_mark, - "[mark] \tdisplay or modify isolation_mark setting"); - static struct settings_data batctl_settings_multicast_mode = { .sysfs_name = SYS_MULTICAST_MODE, .params = sysfs_param_enable,

1 0

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

03 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit e7a5920424cea3863bef10f9ddc98dcc589051d3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Oct 25 18:22:40 2018 +0200 batctl: Move orig_interval setting to own file The sysfs settings are planned to get also be implemented in netlink. To avoid cluttering up netlink.c again, it should be stored in a separate file. This also allows to order the usage lines using the Makefile. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e7a5920424cea3863bef10f9ddc98dcc589051d3 Makefile | 1 + fragmentation.c => orig_interval.c | 14 ++++++++------ sys.c | 9 --------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 8582bf6..a6971d8 100755 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ OBJ += netlink.o OBJ += network_coding.o OBJ += ping.o OBJ += originators.o +OBJ += orig_interval.o OBJ += routing_algo.o OBJ += statistics.o OBJ += sys.o diff --git a/fragmentation.c b/orig_interval.c similarity index 73% copy from fragmentation.c copy to orig_interval.c index e159bdd..d308ea2 100644 --- a/fragmentation.c +++ b/orig_interval.c @@ -20,14 +20,16 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ +#include <stddef.h> + #include "main.h" #include "sys.h" -static struct settings_data batctl_settings_fragmentation = { - .sysfs_name = "fragmentation", - .params = sysfs_param_enable, +static struct settings_data batctl_settings_orig_interval = { + .sysfs_name = "orig_interval", + .params = NULL, }; -COMMAND_NAMED(SUBCOMMAND, fragmentation, "f", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_fragmentation, - "[0|1] \tdisplay or modify fragmentation setting"); +COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, + COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval, + "[interval] \tdisplay or modify orig_interval setting"); diff --git a/sys.c b/sys.c index 932a7e8..6b98ac4 100644 --- a/sys.c +++ b/sys.c @@ -136,12 +136,3 @@ out: free(base_dev); return res; } - -static struct settings_data batctl_settings_orig_interval = { - .sysfs_name = "orig_interval", - .params = NULL, -}; - -COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting, - COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval, - "[interval] \tdisplay or modify orig_interval setting");

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