commits May 2021

commits@lists.open-mesh.org

1 participants
75 discussions

[batctl] master: batctl: genl_json: Add generic JSON interface (ae1a3d3)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit ae1a3d3f0bb724ae6dc7f616383ab6e5ac349893 Author: Alexander Sarmanow <asarmanow(a)gmail.com> Date: Thu May 13 16:02:34 2021 +0200 batctl: genl_json: Add generic JSON interface To print JSON strings in a generic way, a batadv generic netlink to json is introduced. This makes it possible to translate any received object from the genl batadv family without any specialized code. This reduces the code overhead and the changes of implementation errors. Signed-off-by: Alexander Sarmanow <asarmanow(a)gmail.com> [sven(a)narfation.org: fix commit message, cleanup changes, add missing decoding functions] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ae1a3d3f0bb724ae6dc7f616383ab6e5ac349893 Makefile | 1 + genl_json.c | 498 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ genl_json.h | 23 +++ netlink.c | 1 + 4 files changed, 523 insertions(+) diff --git a/Makefile b/Makefile index 98bf695..cee4f0c 100755 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ obj-y += bat-hosts.o obj-y += debug.o obj-y += functions.o obj-y += genl.o +obj-y += genl_json.o obj-y += hash.o obj-y += icmp_helper.o obj-y += main.o diff --git a/genl_json.c b/genl_json.c new file mode 100644 index 0000000..967790c --- /dev/null +++ b/genl_json.c @@ -0,0 +1,498 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Alexander Sarmanow <asarmanow(a)gmail.com> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include "genl_json.h" +#include "main.h" + +#include <arpa/inet.h> +#include <ctype.h> +#include <inttypes.h> +#include <netinet/in.h> +#include <netlink/netlink.h> +#include <netlink/attr.h> +#include <stdbool.h> +#include <stdio.h> +#include <sys/socket.h> + +#include "batadv_packet.h" +#include "batman_adv.h" +#include "netlink.h" + +struct nla_policy_json { + const char *name; + void (*cb)(struct nlattr *attrs[], int idx); +}; + +static void sanitize_string(const char *str) +{ + while (*str) { + if (*str == '"' || *str == '\\') { + putchar('\\'); + putchar(*str); + } else if (!isprint(*str)) { + printf("\\x%02x", *str); + } else { + putchar(*str); + } + str++; + } +} + +static void nljson_print_str(struct nlattr *attrs[], int idx) +{ + const char *value; + + value = nla_get_string(attrs[idx]); + + putchar('"'); + sanitize_string(value); + putchar('"'); +} + +static void nljson_print_flag(struct nlattr *attrs[] __maybe_unused, + int idx __maybe_unused) +{ + printf("true"); +} + +static void nljson_print_bool(struct nlattr *attrs[], int idx) +{ + printf("%s", nla_get_u8(attrs[idx]) ? "true" : "false"); +} + +static void nljson_print_uint8(struct nlattr *attrs[], int idx) +{ + printf("%"PRIu8, nla_get_u8(attrs[idx])); +} + +static void nljson_print_uint16(struct nlattr *attrs[], int idx) +{ + printf("%"PRIu16, nla_get_u16(attrs[idx])); +} + +static void nljson_print_uint32(struct nlattr *attrs[], int idx) +{ + printf("%"PRIu32, nla_get_u32(attrs[idx])); +} + +static void nljson_print_uint64(struct nlattr *attrs[], int idx) +{ + printf("%"PRIu64, nla_get_u64(attrs[idx])); +} + +static void nljson_print_vlanid(struct nlattr *attrs[], int idx) +{ + uint16_t vid = nla_get_u16(attrs[idx]); + + printf("%d", BATADV_PRINT_VID(vid)); +} + +static void nljson_print_mac(struct nlattr *attrs[], int idx) +{ + uint8_t *value = nla_data(attrs[idx]); + + printf("\"%02x:%02x:%02x:%02x:%02x:%02x\"", + value[0], value[1], value[2], value[3], value[4], value[5]); +} + +static void nljson_print_ttflags(struct nlattr *attrs[], int idx) +{ + uint32_t val = nla_get_u32(attrs[idx]); + + putchar('{'); + printf("\"del\": %s,", + val & BATADV_TT_CLIENT_DEL ? "true" : "false"); + printf("\"roam\": %s,", + val & BATADV_TT_CLIENT_ROAM ? "true" : "false"); + printf("\"wifi\": %s,", + val & BATADV_TT_CLIENT_WIFI ? "true" : "false"); + printf("\"isolated\": %s,", + val & BATADV_TT_CLIENT_ISOLA ? "true" : "false"); + printf("\"nopurge\": %s,", + val & BATADV_TT_CLIENT_NOPURGE ? "true" : "false"); + printf("\"new\": %s,", + val & BATADV_TT_CLIENT_NEW ? "true" : "false"); + printf("\"pending\": %s,", + val & BATADV_TT_CLIENT_PENDING ? "true" : "false"); + printf("\"temp\": %s,", + val & BATADV_TT_CLIENT_TEMP ? "true" : "false"); + printf("\"raw\": %"PRIu32, val); + putchar('}'); +} + +static void nljson_print_ipv4(struct nlattr *attrs[], int idx) +{ + uint32_t val = nla_get_u32(attrs[idx]); + struct in_addr in_addr; + char *addr; + + in_addr.s_addr = val; + addr = inet_ntoa(in_addr); + + putchar('"'); + sanitize_string(addr); + putchar('"'); +} + +static void nljson_print_mcastflags(struct nlattr *attrs[], int idx) +{ + uint32_t val = nla_get_u32(attrs[idx]); + + putchar('{'); + printf("\"all_unsnoopables\": %s,", + val & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? "true" : "false"); + printf("\"want_all_ipv4\": %s,", + val & BATADV_MCAST_WANT_ALL_IPV4 ? "true" : "false"); + printf("\"want_all_ipv6\": %s,", + val & BATADV_MCAST_WANT_ALL_IPV6 ? "true" : "false"); + printf("\"want_no_rtr_ipv4\": %s,", + val & BATADV_MCAST_WANT_NO_RTR4 ? "true" : "false"); + printf("\"want_no_rtr_ipv6\": %s,", + val & BATADV_MCAST_WANT_NO_RTR6 ? "true" : "false"); + printf("\"raw\": %"PRIu32, val); + putchar('}'); +} + +static void nljson_print_mcastflags_priv(struct nlattr *attrs[], int idx) +{ + uint32_t val = nla_get_u32(attrs[idx]); + + putchar('{'); + printf("\"bridged\": %s,", + val & BATADV_MCAST_FLAGS_BRIDGED ? "true" : "false"); + printf("\"querier_ipv4_exists\": %s,", + val & BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS ? "true" : "false"); + printf("\"querier_ipv6_exists\": %s,", + val & BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS ? "true" : "false"); + printf("\"querier_ipv4_shadowing\": %s,", + val & BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING ? "true" : "false"); + printf("\"querier_ipv6_shadowing\": %s,", + val & BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING ? "true" : "false"); + printf("\"raw\": %"PRIu32, val); + putchar('}'); +} + +static void nljson_print_gwmode(struct nlattr *attrs[], int idx) +{ + uint8_t val = nla_get_u8(attrs[idx]); + + switch (val) { + case BATADV_GW_MODE_OFF: + printf("\"off\""); + break; + case BATADV_GW_MODE_CLIENT: + printf("\"client\""); + break; + case BATADV_GW_MODE_SERVER: + printf("\"server\""); + break; + default: + printf("\"unknown\""); + break; + } +} + +static void nljson_print_loglevel(struct nlattr *attrs[], int idx) +{ + uint32_t val = nla_get_u32(attrs[idx]); + + putchar('{'); + + putchar('{'); + printf("\"batman\": %s,", + val & BIT(0) ? "true" : "false"); + printf("\"routes\": %s,", + val & BIT(1) ? "true" : "false"); + printf("\"tt\": %s,", + val & BIT(2) ? "true" : "false"); + printf("\"bla\": %s,", + val & BIT(3) ? "true" : "false"); + printf("\"dat\": %s,", + val & BIT(4) ? "true" : "false"); + printf("\"nc\": %s,", + val & BIT(5) ? "true" : "false"); + printf("\"mcast\": %s,", + val & BIT(6) ? "true" : "false"); + printf("\"tp\": %s,", + val & BIT(7) ? "true" : "false"); + printf("\"raw\": %"PRIu32, val); + putchar('}'); +} + +/* WARNING: attributes must also be added to batadv_netlink_policy */ +static const struct nla_policy_json batadv_genl_json[NUM_BATADV_ATTR] = { + [BATADV_ATTR_VERSION] = { + .name = "version", + .cb = nljson_print_str, + }, + [BATADV_ATTR_ALGO_NAME] = { + .name = "algo_name", + .cb = nljson_print_str, + }, + [BATADV_ATTR_MESH_IFINDEX] = { + .name = "mesh_ifindex", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_MESH_IFNAME] = { + .name = "mesh_ifname", + .cb = nljson_print_str, + }, + [BATADV_ATTR_MESH_ADDRESS] = { + .name = "mesh_address", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_HARD_IFINDEX] = { + .name = "hard_ifindex", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_HARD_IFNAME] = { + .name = "hard_ifname", + .cb = nljson_print_str, + }, + [BATADV_ATTR_HARD_ADDRESS] = { + .name = "hard_address", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_ORIG_ADDRESS] = { + .name = "orig_address", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_TPMETER_RESULT] = { + .name = "tpmeter_result", + .cb = nljson_print_uint8, + }, + [BATADV_ATTR_TPMETER_TEST_TIME] = { + .name = "tpmeter_test_time", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_TPMETER_BYTES] = { + .name = "tpmeter_bytes", + .cb = nljson_print_uint64, + }, + [BATADV_ATTR_TPMETER_COOKIE] = { + .name = "tpmeter_cookie", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_ACTIVE] = { + .name = "active", + .cb = nljson_print_flag, + }, + [BATADV_ATTR_TT_ADDRESS] = { + .name = "tt_address", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_TT_TTVN] = { + .name = "tt_ttvn", + .cb = nljson_print_uint8, + }, + [BATADV_ATTR_TT_LAST_TTVN] = { + .name = "tt_last_ttvn", + .cb = nljson_print_uint8, + }, + [BATADV_ATTR_TT_CRC32] = { + .name = "tt_crc32", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_TT_VID] = { + .name = "tt_vid", + .cb = nljson_print_vlanid, + }, + [BATADV_ATTR_TT_FLAGS] = { + .name = "tt_flags", + .cb = nljson_print_ttflags, + }, + [BATADV_ATTR_FLAG_BEST] = { + .name = "best", + .cb = nljson_print_flag, + }, + [BATADV_ATTR_LAST_SEEN_MSECS] = { + .name = "last_seen_msecs", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_NEIGH_ADDRESS] = { + .name = "neigh_address", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_TQ] = { + .name = "tq", + .cb = nljson_print_uint8, + }, + [BATADV_ATTR_THROUGHPUT] = { + .name = "throughput", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_BANDWIDTH_UP] = { + .name = "bandwidth_up", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_BANDWIDTH_DOWN] = { + .name = "bandwidth_down", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_ROUTER] = { + .name = "router", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_BLA_OWN] = { + .name = "bla_own", + .cb = nljson_print_flag, + }, + [BATADV_ATTR_BLA_ADDRESS] = { + .name = "bla_address", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_BLA_VID] = { + .name = "bla_vid", + .cb = nljson_print_vlanid, + }, + [BATADV_ATTR_BLA_BACKBONE] = { + .name = "bla_backbone", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_BLA_CRC] = { + .name = "bla_crc", + .cb = nljson_print_uint16, + }, + [BATADV_ATTR_DAT_CACHE_IP4ADDRESS] = { + .name = "dat_cache_ip4address", + .cb = nljson_print_ipv4, + }, + [BATADV_ATTR_DAT_CACHE_HWADDRESS] = { + .name = "dat_cache_hwaddress", + .cb = nljson_print_mac, + }, + [BATADV_ATTR_DAT_CACHE_VID] = { + .name = "dat_cache_vid", + .cb = nljson_print_vlanid, + }, + [BATADV_ATTR_MCAST_FLAGS] = { + .name = "mcast_flags", + .cb = nljson_print_mcastflags, + }, + [BATADV_ATTR_MCAST_FLAGS_PRIV] = { + .name = "mcast_flags_priv", + .cb = nljson_print_mcastflags_priv, + }, + [BATADV_ATTR_VLANID] = { + .name = "vlanid", + .cb = nljson_print_vlanid, + }, + [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { + .name = "aggregated_ogms_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_AP_ISOLATION_ENABLED] = { + .name = "ap_isolation_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_ISOLATION_MARK] = { + .name = "isolation_mark", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_ISOLATION_MASK] = { + .name = "isolation_mask", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_BONDING_ENABLED] = { + .name = "bonding_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { + .name = "bridge_loop_avoidance_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED] = { + .name = "distributed_arp_table_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_FRAGMENTATION_ENABLED] = { + .name = "fragmentation_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_GW_BANDWIDTH_DOWN] = { + .name = "gw_bandwidth_down", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_GW_BANDWIDTH_UP] = { + .name = "gw_bandwidth_up", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_GW_MODE] = { + .name = "gw_mode", + .cb = nljson_print_gwmode, + }, + [BATADV_ATTR_GW_SEL_CLASS] = { + .name = "gw_sel_class", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_HOP_PENALTY] = { + .name = "hop_penalty", + .cb = nljson_print_uint8, + }, + [BATADV_ATTR_LOG_LEVEL] = { + .name = "log_level", + .cb = nljson_print_loglevel, + }, + [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { + .name = "multicast_forceflood_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_NETWORK_CODING_ENABLED] = { + .name = "network_coding_enabled", + .cb = nljson_print_bool, + }, + [BATADV_ATTR_ORIG_INTERVAL] = { + .name = "orig_interval", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_ELP_INTERVAL] = { + .name = "elp_interval", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { + .name = "throughput_override", + .cb = nljson_print_uint32, + }, + [BATADV_ATTR_MULTICAST_FANOUT] = { + .name = "multicast_fanout", + .cb = nljson_print_uint32, + }, +}; + +void netlink_print_json_entries(struct nlattr *attrs[], struct json_opts *json_opts) +{ + bool first_valid_attr = true; + int i; + + if (!json_opts->is_first) + putchar(','); + else + json_opts->is_first = false; + + putchar('{'); + for (i = 0; i < BATADV_ATTR_MAX + 1; i++) { + if (!attrs[i]) + continue; + + if (!batadv_genl_json[i].cb) + continue; + + if (!first_valid_attr) + putchar(','); + else + first_valid_attr = false; + + putchar('"'); + sanitize_string(batadv_genl_json[i].name); + putchar('"'); + putchar(':'); + batadv_genl_json[i].cb(attrs, i); + } + + putchar('}'); +} diff --git a/genl_json.h b/genl_json.h new file mode 100644 index 0000000..87f4d6f --- /dev/null +++ b/genl_json.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Alexander Sarmanow <asarmanow(a)gmail.com> + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#ifndef _BATCTL_GENLJSON_H +#define _BATCTL_GENLJSON_H + +#include <stdint.h> + +#include "netlink.h" + +struct json_opts { + uint8_t is_first:1; + struct nlquery_opts query_opts; +}; + +void netlink_print_json_entries(struct nlattr *attrs[], struct json_opts *json_opts); + +#endif /* _BATCTL_GENLJSON_H */ diff --git a/netlink.c b/netlink.c index 2c45645..33cfa4c 100644 --- a/netlink.c +++ b/netlink.c @@ -29,6 +29,7 @@ #include "functions.h" #include "main.h" +/* WARNING: attributes must also be added to batadv_genl_json */ struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_VERSION] = { .type = NLA_STRING,

1 0

[batctl] master: batctl: netlink: Make netlink_query_common non-static (a92de0e)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit a92de0e990c1b90914ae63e2c426cdfdf93bb978 Author: Alexander Sarmanow <asarmanow(a)gmail.com> Date: Thu May 13 16:02:33 2021 +0200 batctl: netlink: Make netlink_query_common non-static With a view to the introduction of a JSON debug support the netlink_query_common can be used for simple query of batman-adv attributes without any filters. Signed-off-by: Alexander Sarmanow <asarmanow(a)gmail.com> [sven(a)narfation.org: fix commit message, cleanup changes] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- a92de0e990c1b90914ae63e2c426cdfdf93bb978 netlink.c | 12 ++++-------- netlink.h | 8 ++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/netlink.c b/netlink.c index eb5888b..2c45645 100644 --- a/netlink.c +++ b/netlink.c @@ -29,10 +29,6 @@ #include "functions.h" #include "main.h" -struct nlquery_opts { - int err; -}; - struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_VERSION] = { .type = NLA_STRING, @@ -623,10 +619,10 @@ static int nlquery_stop_cb(struct nl_msg *msg, void *arg) return NL_STOP; } -static int netlink_query_common(struct state *state, - unsigned int mesh_ifindex, uint8_t nl_cmd, - nl_recvmsg_msg_cb_t callback, int flags, - struct nlquery_opts *query_opts) +int netlink_query_common(struct state *state, + unsigned int mesh_ifindex, uint8_t nl_cmd, + nl_recvmsg_msg_cb_t callback, int flags, + struct nlquery_opts *query_opts) { struct nl_msg *msg; struct nl_cb *cb; diff --git a/netlink.h b/netlink.h index 2cc5862..20fb39b 100644 --- a/netlink.h +++ b/netlink.h @@ -25,6 +25,10 @@ struct print_opts { uint8_t nl_cmd; }; +struct nlquery_opts { + int err; +}; + struct ether_addr; int netlink_create(struct state *state); @@ -54,6 +58,10 @@ int netlink_print_error(struct sockaddr_nl *nla, struct nlmsgerr *nlerr, void *arg); void netlink_print_remaining_header(struct print_opts *opts); +int netlink_query_common(struct state *state, unsigned int mesh_ifindex, + uint8_t nl_cmd, nl_recvmsg_msg_cb_t callback, + int flags, struct nlquery_opts *query_opts); + extern char algo_name_buf[256]; extern int last_err; extern int64_t mcast_flags;

1 0

[batman-adv] master: batman-adv: convert ifmcaddr6 to RCU (007b4c4b)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 007b4c4b031f565205c0702af4c5b1c81d5009c4 Author: Taehee Yoo <ap420073(a)gmail.com> Date: Sun Apr 18 22:14:22 2021 +0200 batman-adv: convert ifmcaddr6 to RCU The ifmcaddr6 has been protected by inet6_dev->lock(rwlock) so that the critical section is atomic context. In order to switch this context, changing locking is needed. The ifmcaddr6 actually already protected by RTNL So if it's converted to use RCU, its control path context can be switched to sleepable. Suggested-by: Cong Wang <xiyou.wangcong(a)gmail.com> Signed-off-by: Taehee Yoo <ap420073(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [linus.luessing(a)c0d3.blue: Add compat code] Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 007b4c4b031f565205c0702af4c5b1c81d5009c4 compat-include/net/addrconf.h | 85 +++++++++++++++++++++++++++++++++++++++++++ net/batman-adv/multicast.c | 6 +-- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/compat-include/net/addrconf.h b/compat-include/net/addrconf.h index 30124124..080e1dda 100644 --- a/compat-include/net/addrconf.h +++ b/compat-include/net/addrconf.h @@ -25,4 +25,89 @@ static inline int batadv_ipv6_mc_check_mld(struct sk_buff *skb) #endif /* LINUX_VERSION_IS_LESS(5, 1, 0) */ +#if LINUX_VERSION_IS_LESS(5, 13, 0) + +static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr, + struct hlist_head *mcast_list); + +static inline int +compat_batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, + struct hlist_head *mcast_list, + struct batadv_mcast_mla_flags *flags, + u8 *mcast_addr, + struct batadv_hw_addr *new, + struct inet6_dev *in6_dev) + +{ + struct ifmcaddr6 *pmc6; + int ret = 0; + + if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_IPV6) + return 0; + + rcu_read_lock(); + + in6_dev = __in6_dev_get(dev); + if (!in6_dev) { + rcu_read_unlock(); + return 0; + } + + read_lock_bh(&in6_dev->lock); + for (pmc6 = in6_dev->mc_list; pmc6; pmc6 = pmc6->next) { + if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) < + IPV6_ADDR_SCOPE_LINKLOCAL) + continue; + + if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && + ipv6_addr_is_ll_all_nodes(&pmc6->mca_addr)) + continue; + + if (!(flags->tvlv_flags & BATADV_MCAST_WANT_NO_RTR6) && + IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) > + IPV6_ADDR_SCOPE_LINKLOCAL) + continue; + + ipv6_eth_mc_map(&pmc6->mca_addr, mcast_addr); + + if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list)) + continue; + + new = kmalloc(sizeof(*new), GFP_ATOMIC); + if (!new) { + ret = -ENOMEM; + break; + } + + ether_addr_copy(new->addr, mcast_addr); + hlist_add_head(&new->list, mcast_list); + ret++; + } + read_unlock_bh(&in6_dev->lock); + rcu_read_unlock(); + + return ret; +} + +#define ifmcaddr6 \ + net_device *orig_dev = dev; \ + return compat_batadv_mcast_mla_softif_get_ipv6(orig_dev, \ + mcast_list, \ + flags, \ + mcast_addr, \ + new = NULL, \ + in6_dev = NULL); \ + } \ + static inline int \ + __unused_batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, \ + struct hlist_head *mcast_list, \ + struct batadv_mcast_mla_flags *flags) \ + { \ + struct batadv_hw_addr *new; \ + struct inet6_dev *in6_dev; \ + u8 mcast_addr[ETH_ALEN]; \ + struct ifmcaddr6 + +#endif /* LINUX_VERSION_IS_LESS(5, 13, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_NET_ADDRCONF_H_ */ diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 28166402..1d63c8cb 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -454,8 +454,9 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, return 0; } - read_lock_bh(&in6_dev->lock); - for (pmc6 = in6_dev->mc_list; pmc6; pmc6 = pmc6->next) { + for (pmc6 = rcu_dereference(in6_dev->mc_list); + pmc6; + pmc6 = rcu_dereference(pmc6->next)) { if (IPV6_ADDR_MC_SCOPE(&pmc6->mca_addr) < IPV6_ADDR_SCOPE_LINKLOCAL) continue; @@ -484,7 +485,6 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, hlist_add_head(&new->list, mcast_list); ret++; } - read_unlock_bh(&in6_dev->lock); rcu_read_unlock(); return ret;

1 0

[batctl] master: batctl: translocal: Simplify evaluation of last_seen (e23eb59)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit e23eb596d36bd983f05139f6c1bd7ce381a5695b Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:29:53 2021 +0200 batctl: translocal: Simplify evaluation of last_seen The BATADV_ATTR_LAST_SEEN_MSECS is send from the kernel whenever it is relevant for the current local translation table entry. It is therefore not necessary to only read this value when a specific flag is or is not present in BATADV_ATTR_TT_FLAGS. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e23eb596d36bd983f05139f6c1bd7ce381a5695b translocal.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/translocal.c b/translocal.c index a3ad3da..bac6be9 100644 --- a/translocal.c +++ b/translocal.c @@ -89,15 +89,10 @@ static int translocal_callback(struct nl_msg *msg, void *arg) w = 'W'; if (flags & BATADV_TT_CLIENT_ISOLA) i = 'I'; - - if (flags & BATADV_TT_CLIENT_NOPURGE) { + if (flags & BATADV_TT_CLIENT_NOPURGE) p = 'P'; - } else { - if (!attrs[BATADV_ATTR_LAST_SEEN_MSECS]) { - fputs("Received invalid data from kernel.\n", stderr); - exit(1); - } + if (attrs[BATADV_ATTR_LAST_SEEN_MSECS]) { last_seen_msecs = nla_get_u32( attrs[BATADV_ATTR_LAST_SEEN_MSECS]); last_seen_secs = last_seen_msecs / 1000;

1 0

[batctl] master: batctl: Avoid boolean in structures (62af39f)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 62af39f7f7be62d4ecff1c57a1ea4fadf28f7b3e Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:39:06 2021 +0200 batctl: Avoid boolean in structures Booleans inside structures to really only store a single bit of information is often a waste of space because a boolean is stored using multiple bytes. While this is not too relevant for batctl, just use the same way of storing such values as in the rest of batman-adv to avoid different paradigms in related code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 62af39f7f7be62d4ecff1c57a1ea4fadf28f7b3e netlink.c | 8 ++++---- throughputmeter.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netlink.c b/netlink.c index 7afd38b..eb5888b 100644 --- a/netlink.c +++ b/netlink.c @@ -677,7 +677,7 @@ static const int translate_mac_netlink_mandatory[] = { struct translate_mac_netlink_opts { struct ether_addr mac; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; @@ -765,7 +765,7 @@ struct get_nexthop_netlink_opts { struct ether_addr mac; uint8_t *nexthop; char *ifname; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; @@ -865,7 +865,7 @@ static const int get_primarymac_netlink_mandatory[] = { struct get_primarymac_netlink_opts { uint8_t *primarymac; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; @@ -938,7 +938,7 @@ int get_primarymac_netlink(struct state *state, uint8_t *primarymac) struct get_algoname_netlink_opts { char *algoname; size_t algoname_len; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; diff --git a/throughputmeter.c b/throughputmeter.c index 7f89651..fb1e35b 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -38,16 +38,16 @@ static struct state *tp_state; struct tp_result { int error; - bool found; uint32_t cookie; uint8_t return_value; + uint8_t found:1; uint32_t test_time; uint64_t total_bytes; }; struct tp_cookie { int error; - bool found; + uint8_t found:1; uint32_t cookie; };

1 0

[batctl] master: batctl: Realign netlink_policy array (7efb5de)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 7efb5de35f16272a5cdd0d6733d60727a11f5ed9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:24:59 2021 +0200 batctl: Realign netlink_policy array The netlink_policy contains an array of structures with several members in it. But the initialization of the entries of this array was not aligned like any other initialization in the batctl code - instead it was tried to have everything on the same same line. This resulted in rather long lines and could result in larger commits which just try to realign the whole table when a new entry with a long identifier was added. Just realign the array to better match the rest of the code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7efb5de35f16272a5cdd0d6733d60727a11f5ed9 netlink.c | 280 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 200 insertions(+), 80 deletions(-) diff --git a/netlink.c b/netlink.c index c821d0f..7afd38b 100644 --- a/netlink.c +++ b/netlink.c @@ -34,86 +34,206 @@ struct nlquery_opts { }; struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { - [BATADV_ATTR_VERSION] = { .type = NLA_STRING }, - [BATADV_ATTR_ALGO_NAME] = { .type = NLA_STRING }, - [BATADV_ATTR_MESH_IFINDEX] = { .type = NLA_U32 }, - [BATADV_ATTR_MESH_IFNAME] = { .type = NLA_STRING, - .maxlen = IFNAMSIZ }, - [BATADV_ATTR_MESH_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_HARD_IFINDEX] = { .type = NLA_U32 }, - [BATADV_ATTR_HARD_IFNAME] = { .type = NLA_STRING, - .maxlen = IFNAMSIZ }, - [BATADV_ATTR_HARD_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_ORIG_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_TPMETER_RESULT] = { .type = NLA_U8 }, - [BATADV_ATTR_TPMETER_TEST_TIME] = { .type = NLA_U32 }, - [BATADV_ATTR_TPMETER_BYTES] = { .type = NLA_U64 }, - [BATADV_ATTR_TPMETER_COOKIE] = { .type = NLA_U32 }, - [BATADV_ATTR_PAD] = { .type = NLA_UNSPEC }, - [BATADV_ATTR_ACTIVE] = { .type = NLA_FLAG }, - [BATADV_ATTR_TT_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_TT_TTVN] = { .type = NLA_U8 }, - [BATADV_ATTR_TT_LAST_TTVN] = { .type = NLA_U8 }, - [BATADV_ATTR_TT_CRC32] = { .type = NLA_U32 }, - [BATADV_ATTR_TT_VID] = { .type = NLA_U16 }, - [BATADV_ATTR_TT_FLAGS] = { .type = NLA_U32 }, - [BATADV_ATTR_FLAG_BEST] = { .type = NLA_FLAG }, - [BATADV_ATTR_LAST_SEEN_MSECS] = { .type = NLA_U32 }, - [BATADV_ATTR_NEIGH_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_TQ] = { .type = NLA_U8 }, - [BATADV_ATTR_THROUGHPUT] = { .type = NLA_U32 }, - [BATADV_ATTR_BANDWIDTH_UP] = { .type = NLA_U32 }, - [BATADV_ATTR_BANDWIDTH_DOWN] = { .type = NLA_U32 }, - [BATADV_ATTR_ROUTER] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_BLA_OWN] = { .type = NLA_FLAG }, - [BATADV_ATTR_BLA_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_BLA_VID] = { .type = NLA_U16 }, - [BATADV_ATTR_BLA_BACKBONE] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_BLA_CRC] = { .type = NLA_U16 }, - [BATADV_ATTR_DAT_CACHE_IP4ADDRESS] = { .type = NLA_U32 }, - [BATADV_ATTR_DAT_CACHE_HWADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_DAT_CACHE_VID] = { .type = NLA_U16 }, - [BATADV_ATTR_MCAST_FLAGS] = { .type = NLA_U32 }, - [BATADV_ATTR_MCAST_FLAGS_PRIV] = { .type = NLA_U32 }, - [BATADV_ATTR_VLANID] = { .type = NLA_U16 }, - [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_AP_ISOLATION_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_ISOLATION_MARK] = { .type = NLA_U32 }, - [BATADV_ATTR_ISOLATION_MASK] = { .type = NLA_U32 }, - [BATADV_ATTR_BONDING_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_FRAGMENTATION_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_GW_BANDWIDTH_DOWN] = { .type = NLA_U32 }, - [BATADV_ATTR_GW_BANDWIDTH_UP] = { .type = NLA_U32 }, - [BATADV_ATTR_GW_MODE] = { .type = NLA_U8 }, - [BATADV_ATTR_GW_SEL_CLASS] = { .type = NLA_U32 }, - [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, - [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, - [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, - [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, - [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, - [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { .type = NLA_U32 }, + [BATADV_ATTR_VERSION] = { + .type = NLA_STRING, + }, + [BATADV_ATTR_ALGO_NAME] = { + .type = NLA_STRING, + }, + [BATADV_ATTR_MESH_IFINDEX] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MESH_IFNAME] = { + .type = NLA_STRING, + .maxlen = IFNAMSIZ, + }, + [BATADV_ATTR_MESH_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_HARD_IFINDEX] = { + .type = NLA_U32, + }, + [BATADV_ATTR_HARD_IFNAME] = { + .type = NLA_STRING, + .maxlen = IFNAMSIZ, + }, + [BATADV_ATTR_HARD_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_ORIG_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_TPMETER_RESULT] = { + .type = NLA_U8, + }, + [BATADV_ATTR_TPMETER_TEST_TIME] = { + .type = NLA_U32, + }, + [BATADV_ATTR_TPMETER_BYTES] = { + .type = NLA_U64, + }, + [BATADV_ATTR_TPMETER_COOKIE] = { + .type = NLA_U32, + }, + [BATADV_ATTR_PAD] = { + .type = NLA_UNSPEC, + }, + [BATADV_ATTR_ACTIVE] = { + .type = NLA_FLAG, + }, + [BATADV_ATTR_TT_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_TT_TTVN] = { + .type = NLA_U8, + }, + [BATADV_ATTR_TT_LAST_TTVN] = { + .type = NLA_U8, + }, + [BATADV_ATTR_TT_CRC32] = { + .type = NLA_U32, + }, + [BATADV_ATTR_TT_VID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_TT_FLAGS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_FLAG_BEST] = { + .type = NLA_FLAG, + }, + [BATADV_ATTR_LAST_SEEN_MSECS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_NEIGH_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_TQ] = { + .type = NLA_U8, + }, + [BATADV_ATTR_THROUGHPUT] = { + .type = NLA_U32, + }, + [BATADV_ATTR_BANDWIDTH_UP] = { + .type = NLA_U32, + }, + [BATADV_ATTR_BANDWIDTH_DOWN] = { + .type = NLA_U32, + }, + [BATADV_ATTR_ROUTER] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_BLA_OWN] = { + .type = NLA_FLAG, + }, + [BATADV_ATTR_BLA_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_BLA_VID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_BLA_BACKBONE] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_BLA_CRC] = { + .type = NLA_U16, + }, + [BATADV_ATTR_DAT_CACHE_IP4ADDRESS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_DAT_CACHE_HWADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_DAT_CACHE_VID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_MCAST_FLAGS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MCAST_FLAGS_PRIV] = { + .type = NLA_U32, + }, + [BATADV_ATTR_VLANID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_AP_ISOLATION_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_ISOLATION_MARK] = { + .type = NLA_U32, + }, + [BATADV_ATTR_ISOLATION_MASK] = { + .type = NLA_U32, + }, + [BATADV_ATTR_BONDING_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_FRAGMENTATION_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_GW_BANDWIDTH_DOWN] = { + .type = NLA_U32, + }, + [BATADV_ATTR_GW_BANDWIDTH_UP] = { + .type = NLA_U32, + }, + [BATADV_ATTR_GW_MODE] = { + .type = NLA_U8, + }, + [BATADV_ATTR_GW_SEL_CLASS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_HOP_PENALTY] = { + .type = NLA_U8, + }, + [BATADV_ATTR_LOG_LEVEL] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_NETWORK_CODING_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_ORIG_INTERVAL] = { + .type = NLA_U32, + }, + [BATADV_ATTR_ELP_INTERVAL] = { + .type = NLA_U32, + }, + [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MULTICAST_FANOUT] = { + .type = NLA_U32, + }, }; int netlink_create(struct state *state)

1 0

[batctl] master: batctl: throughputmeter: Use global genl socket (b25e030)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit b25e030c8e5e1884666d3e21713fd87c0d776e50 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 17:01:59 2021 +0200 batctl: throughputmeter: Use global genl socket The batctl framework can take care of creating the netlink socket and gathering the data for a mesh interface. It is not necessary to duplicate all the code to create, setup and destroy the batadv genl socket for a standard socket. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b25e030c8e5e1884666d3e21713fd87c0d776e50 throughputmeter.c | 105 +++++++++++------------------------------------------- 1 file changed, 21 insertions(+), 84 deletions(-) diff --git a/throughputmeter.c b/throughputmeter.c index f50f521..7f89651 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -34,7 +34,7 @@ #include "netlink.h" static struct ether_addr *dst_mac; -static char *tp_mesh_iface; +static struct state *tp_state; struct tp_result { int error; @@ -151,62 +151,34 @@ static int tp_meter_cookie_callback(struct nl_msg *msg, void *arg) return NL_OK; } -static int tp_meter_start(char *mesh_iface, struct ether_addr *dst_mac, + +static int tp_meter_start(struct state *state, struct ether_addr *dst_mac, uint32_t time, struct tp_cookie *cookie) { - struct nl_sock *sock; struct nl_msg *msg; struct nl_cb *cb; - int ifindex; - int family; - int ret; int err = 0; - sock = nl_socket_alloc(); - if (!sock) - return -ENOMEM; - - ret = genl_connect(sock); - if (ret < 0) { - err = -EOPNOTSUPP; - goto out; - } - - family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) { - err = -EOPNOTSUPP; - goto out; - } - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - fprintf(stderr, "Interface %s is unknown\n", mesh_iface); - err = -ENODEV; - goto out; - } - cb = nl_cb_alloc(NL_CB_DEFAULT); nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, tp_meter_cookie_callback, cookie); nl_cb_err(cb, NL_CB_CUSTOM, tpmeter_nl_print_error, cookie); msg = nlmsg_alloc(); - if (!msg) { - err = -ENOMEM; - goto out; - } + if (!msg) + return -ENOMEM; - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, 0, BATADV_CMD_TP_METER, 1); - nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, ifindex); + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, state->mesh_ifindex); nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, dst_mac); nla_put_u32(msg, BATADV_ATTR_TPMETER_TEST_TIME, time); - nl_send_auto_complete(sock, msg); + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); - nl_recvmsgs(sock, cb); + nl_recvmsgs(state->sock, cb); nl_cb_put(cb); @@ -215,9 +187,6 @@ static int tp_meter_start(char *mesh_iface, struct ether_addr *dst_mac, else if (!cookie->found) err= -EINVAL; -out: - nl_socket_free(sock); - return err; } @@ -251,57 +220,24 @@ static int tp_recv_result(struct nl_sock *sock, struct tp_result *result) return err; } -static int tp_meter_stop(char *mesh_iface, struct ether_addr *dst_mac) +static int tp_meter_stop(struct state *state, struct ether_addr *dst_mac) { - struct nl_sock *sock; struct nl_msg *msg; - int ifindex; - int family; - int ret; - int err = 0; - - sock = nl_socket_alloc(); - if (!sock) - return -ENOMEM; - - ret = genl_connect(sock); - if (ret < 0) { - err = -EOPNOTSUPP; - goto out; - } - - family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) { - err = -EOPNOTSUPP; - goto out; - } - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - fprintf(stderr, "Interface %s is unknown\n", mesh_iface); - err = -ENODEV; - goto out; - } msg = nlmsg_alloc(); - if (!msg) { - err = -ENOMEM; - goto out; - } + if (!msg) + return -ENOMEM; - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, 0, BATADV_CMD_TP_METER_CANCEL, 1); - nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, ifindex); + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, state->mesh_ifindex); nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, dst_mac); - nl_send_auto_complete(sock, msg); + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); -out: - nl_socket_free(sock); - - return err; + return 0; } static struct nl_sock *tp_prepare_listening_sock(void) @@ -358,7 +294,7 @@ void tp_sig_handler(int sig) case SIGINT: case SIGTERM: fflush(stdout); - tp_meter_stop(tp_mesh_iface, dst_mac); + tp_meter_stop(tp_state, dst_mac); break; default: break; @@ -443,7 +379,7 @@ static int throughputmeter(struct state *state, int argc, char **argv) dst_string = ether_ntoa_long(dst_mac); /* for sighandler */ - tp_mesh_iface = state->mesh_iface; + tp_state = state; signal(SIGINT, tp_sig_handler); signal(SIGTERM, tp_sig_handler); @@ -451,7 +387,7 @@ static int throughputmeter(struct state *state, int argc, char **argv) if (!listen_sock) goto out; - ret = tp_meter_start(state->mesh_iface, dst_mac, time, &cookie); + ret = tp_meter_start(state, dst_mac, time, &cookie); if (ret < 0) { printf("Failed to send tp_meter request to kernel: %d\n", ret); goto out; @@ -529,5 +465,6 @@ out: return ret; } -COMMAND(SUBCOMMAND_MIF, throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, throughputmeter, "tp", + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, NULL, "<destination> \tstart a throughput measurement");

1 0

[batctl] master: batctl: originators: Get outgoing ifname from netlink (6aa8de3)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 6aa8de3676d8b4c6cfe5c27ad2ee985e3bc56fdf Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:07:31 2021 +0200 batctl: originators: Get outgoing ifname from netlink There is no need to gather the interface name for an outgoing interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this originator table entry. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6aa8de3676d8b4c6cfe5c27ad2ee985e3bc56fdf originators.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/originators.c b/originators.c index a8b313e..9f4f526 100644 --- a/originators.c +++ b/originators.c @@ -40,12 +40,14 @@ static int originators_callback(struct nl_msg *msg, void *arg) struct nlmsghdr *nlh = nlmsg_hdr(msg); int last_seen_msecs, last_seen_secs; struct print_opts *opts = arg; + char ifname_buf[IF_NAMESIZE]; struct bat_host *bat_host; struct genlmsghdr *ghdr; - char ifname[IF_NAMESIZE]; + uint32_t ifindex; float last_seen; uint8_t *neigh; uint8_t *orig; + char *ifname; char c = ' '; uint8_t tq; @@ -74,9 +76,16 @@ static int originators_callback(struct nl_msg *msg, void *arg) 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_HARD_IFNAME]) { + ifname = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); + if (!if_indextoname(ifindex, ifname_buf)) + ifname_buf[0] = '\0'; + + ifname = ifname_buf; + } if (attrs[BATADV_ATTR_FLAG_BEST]) c = '*';

1 0

[batctl] master: batctl: neighbors: Get outgoing ifname from netlink (784009d)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 784009d650986b08ca8318bc5373a9151354f5ae Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:07:32 2021 +0200 batctl: neighbors: Get outgoing ifname from netlink There is no need to gather the interface name for an outgoing interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this neighbor table entry. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 784009d650986b08ca8318bc5373a9151354f5ae neighbors.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/neighbors.c b/neighbors.c index af76d0f..3102b0e 100644 --- a/neighbors.c +++ b/neighbors.c @@ -36,10 +36,12 @@ static int neighbors_callback(struct nl_msg *msg, void *arg) struct nlmsghdr *nlh = nlmsg_hdr(msg); int last_seen_msecs, last_seen_secs; struct print_opts *opts = arg; + char ifname_buf[IF_NAMESIZE]; struct bat_host *bat_host; - char ifname[IF_NAMESIZE]; struct genlmsghdr *ghdr; + uint32_t ifindex; uint8_t *neigh; + char *ifname; if (!genlmsg_valid_hdr(nlh, 0)) { fputs("Received invalid data from kernel.\n", stderr); @@ -66,9 +68,16 @@ static int neighbors_callback(struct nl_msg *msg, void *arg) neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); bat_host = bat_hosts_find_by_mac((char *)neigh); - if (!if_indextoname(nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]), - ifname)) - ifname[0] = '\0'; + if (attrs[BATADV_ATTR_HARD_IFNAME]) { + ifname = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); + if (!if_indextoname(ifindex, ifname_buf)) + ifname_buf[0] = '\0'; + + ifname = ifname_buf; + } last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); last_seen_secs = last_seen_msecs / 1000;

1 0

[batctl] master: batctl: ping: Get outgoing ifname from netlink (426e48c)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 426e48c8d9caa5972f305169641236e857be8c03 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:07:33 2021 +0200 batctl: ping: Get outgoing ifname from netlink There is no need to gather the interface name for an outgoing interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this originator table entry. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 426e48c8d9caa5972f305169641236e857be8c03 netlink.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/netlink.c b/netlink.c index b8bca30..c821d0f 100644 --- a/netlink.c +++ b/netlink.c @@ -693,9 +693,16 @@ static int get_nexthop_netlink_cb(struct nl_msg *msg, void *arg) /* save result */ memcpy(opts->nexthop, neigh, ETH_ALEN); - ifname = if_indextoname(index, opts->ifname); - if (!ifname) - return NL_OK; + + if (attrs[BATADV_ATTR_HARD_IFNAME]) { + ifname = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + strncpy(opts->ifname, ifname, IFNAMSIZ); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + ifname = if_indextoname(index, opts->ifname); + if (!ifname) + return NL_OK; + } opts->found = true; opts->query_opts.err = 0;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2021