B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

[PATCH 1/2] batctl: tcpdump: Add support for MCASTv2 RTR(4|6) flags
by Sven Eckelmann 29 Jun '19

29 Jun '19

The batman-adv commit 0a7733468f95 ("batman-adv: mcast: detect, distribute and maintain multicast router presence") added support for two new flags BATADV_MCAST_WANT_NO_RTR4 and BATADV_MCAST_WANT_NO_RTR6. These are announced in IV_OGM and OGMv2. batctl's tcpdump requires support for it to make debugging of router-to-router multicast problems in networks easier. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- tcpdump.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 158b82e..0e2ae8e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -230,10 +230,12 @@ static void batctl_tvlv_parse_mcast_v2(void *buff, ssize_t buff_len) flags = tvlv->flags; - printf("\tTVLV MCASTv2: [%c%c%c]\n", + printf("\tTVLV MCASTv2: [%c%c%c%s%s]\n", flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES ? 'U' : '.', flags & BATADV_MCAST_WANT_ALL_IPV4 ? '4' : '.', - flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.'); + flags & BATADV_MCAST_WANT_ALL_IPV6 ? '6' : '.', + !(flags & BATADV_MCAST_WANT_NO_RTR4) ? "R4" : ". ", + !(flags & BATADV_MCAST_WANT_NO_RTR6) ? "R6" : ". "); } typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len); -- 2.20.1

1 1

[PATCH 00/10] pull request for net-next: batman-adv 2019-06-27 v2
by Simon Wunderlich 28 Jun '19

28 Jun '19

Hi David, here is the updated feature/cleanup pull request of batman-adv for net-next from yesterday. Your change suggestions have been integrated into Patch 6 of the series, everything else is unchanged. Please pull or let me know of any problem! Thank you, Simon The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20190627v2 for you to fetch changes up to 11d458c1cb9b24ac899b1ec6284676f6b1914305: batman-adv: mcast: apply optimizations for routable packets, too (2019-06-27 19:25:05 +0200) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - fix includes for _MAX constants, atomic functions and fwdecls, by Sven Eckelmann (3 patches) - shorten multicast tt/tvlv worker spinlock section, by Linus Luessing - routeable multicast preparations: implement MAC multicast filtering, by Linus Luessing (2 patches, David Millers comments integrated) - remove return value checks for debugfs_create, by Greg Kroah-Hartman - add routable multicast optimizations, by Linus Luessing (2 patches) ---------------------------------------------------------------- Greg Kroah-Hartman (1): batman-adv: no need to check return value of debugfs_create functions Linus Lüssing (5): batman-adv: mcast: shorten multicast tt/tvlv worker spinlock section batman-adv: mcast: collect softif listeners from IP lists instead batman-adv: mcast: avoid redundant multicast TT entries with bridges batman-adv: mcast: detect, distribute and maintain multicast router presence batman-adv: mcast: apply optimizations for routable packets, too Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (3): batman-adv: Fix includes for *_MAX constants batman-adv: Add missing include for atomic functions batman-adv: Use includes instead of fwdecls include/uapi/linux/batadv_packet.h | 8 + net/batman-adv/bat_algo.h | 7 +- net/batman-adv/bat_v.c | 3 +- net/batman-adv/bat_v_elp.h | 4 +- net/batman-adv/bat_v_ogm.h | 3 +- net/batman-adv/bridge_loop_avoidance.h | 9 +- net/batman-adv/debugfs.c | 99 +-- net/batman-adv/debugfs.h | 9 +- net/batman-adv/distributed-arp-table.h | 7 +- net/batman-adv/fragmentation.h | 3 +- net/batman-adv/gateway_client.h | 9 +- net/batman-adv/gateway_common.c | 1 + net/batman-adv/gateway_common.h | 3 +- net/batman-adv/hard-interface.c | 7 +- net/batman-adv/hard-interface.h | 5 +- net/batman-adv/hash.h | 3 +- net/batman-adv/icmp_socket.c | 20 +- net/batman-adv/icmp_socket.h | 5 +- net/batman-adv/log.c | 17 +- net/batman-adv/log.h | 1 + net/batman-adv/main.h | 12 +- net/batman-adv/multicast.c | 1092 +++++++++++++++++++++++++------- net/batman-adv/multicast.h | 6 +- net/batman-adv/netlink.c | 4 +- net/batman-adv/netlink.h | 3 +- net/batman-adv/network-coding.c | 29 +- net/batman-adv/network-coding.h | 14 +- net/batman-adv/originator.c | 4 +- net/batman-adv/originator.h | 7 +- net/batman-adv/routing.h | 3 +- net/batman-adv/send.h | 3 +- net/batman-adv/soft-interface.c | 6 +- net/batman-adv/soft-interface.h | 7 +- net/batman-adv/sysfs.c | 1 + net/batman-adv/sysfs.h | 5 +- net/batman-adv/tp_meter.c | 1 + net/batman-adv/tp_meter.h | 3 +- net/batman-adv/translation-table.h | 9 +- net/batman-adv/tvlv.h | 3 +- net/batman-adv/types.h | 69 +- 40 files changed, 1041 insertions(+), 463 deletions(-)

3 12

[PATCH 0/2] pull request for net: batman-adv 2019-06-27
by Simon Wunderlich 28 Jun '19

28 Jun '19

Hi David, here are some bugfixes which we would like to have integrated into net. Please pull or let me know of any problem! Thank you, Simon The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-net-for-davem-20190627 for you to fetch changes up to 9e6b5648bbc4cd48fab62cecbb81e9cc3c6e7e88: batman-adv: Fix duplicated OGMs on NETDEV_UP (2019-06-02 13:33:48 +0200) ---------------------------------------------------------------- Here are some batman-adv bugfixes: - fix a leaked TVLV handler which wasn't unregistered, by Jeremy Sowden - fix duplicated OGMs when interfaces are set UP, by Sven Eckelmann ---------------------------------------------------------------- Jeremy Sowden (1): batman-adv: fix for leaked TVLV handler. Sven Eckelmann (1): batman-adv: Fix duplicated OGMs on NETDEV_UP net/batman-adv/bat_iv_ogm.c | 4 ++-- net/batman-adv/hard-interface.c | 3 +++ net/batman-adv/translation-table.c | 2 ++ net/batman-adv/types.h | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-)

2 3

[PATCH v2] batman-adv: Get inet(6) device inside RCU protected region
by Sven Eckelmann 27 Jun '19

27 Jun '19

It is not necessary to get the inet(6)_dev outside of the rcu protected region by using reference counting. Instead, the in(6)_dev_get can be replaced by the non-refcnt function and everything can be moved inside the rcu protected region. Fixes: 0a7733468f95 ("batman-adv: mcast: detect, distribute and maintain multicast router presence") Reported-by: David Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v2: * leave read_lock_bh for in6_dev->mc_list net/batman-adv/multicast.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 40ceab95..67d7f830 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -379,11 +379,14 @@ batadv_mcast_mla_softif_get_ipv4(struct net_device *dev, if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_IPV4) return 0; - in_dev = in_dev_get(dev); - if (!in_dev) + rcu_read_lock(); + + in_dev = __in_dev_get_rcu(dev); + if (!in_dev) { + rcu_read_unlock(); return 0; + } - rcu_read_lock(); for (pmc = rcu_dereference(in_dev->mc_list); pmc; pmc = rcu_dereference(pmc->next_rcu)) { if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && @@ -410,7 +413,6 @@ batadv_mcast_mla_softif_get_ipv4(struct net_device *dev, ret++; } rcu_read_unlock(); - in_dev_put(in_dev); return ret; } @@ -444,9 +446,13 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_IPV6) return 0; - in6_dev = in6_dev_get(dev); - if (!in6_dev) + 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) { @@ -479,7 +485,7 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, ret++; } read_unlock_bh(&in6_dev->lock); - in6_dev_put(in6_dev); + rcu_read_unlock(); return ret; } -- 2.20.1

1 1

[PATCH] batman-adv: Get inet(6) device inside RCU protected region
by Sven Eckelmann 27 Jun '19

27 Jun '19

It is not necessary to get the inet(6)_dev outside of the rcu protected region by using reference counting. Instead, the in(6)_dev_get can be replaced by the non-refcnt function and everything can be moved inside the rcu protected region. Fixes: 0a7733468f95 ("batman-adv: mcast: detect, distribute and maintain multicast router presence") Reported-by: David Miller <davem(a)davemloft.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Cc: Linus Lüssing <linus.luessing(a)c0d3.blue> net/batman-adv/multicast.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 40ceab95..9c18cf40 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -379,11 +379,14 @@ batadv_mcast_mla_softif_get_ipv4(struct net_device *dev, if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_IPV4) return 0; - in_dev = in_dev_get(dev); - if (!in_dev) + rcu_read_lock(); + + in_dev = __in_dev_get_rcu(dev); + if (!in_dev) { + rcu_read_unlock(); return 0; + } - rcu_read_lock(); for (pmc = rcu_dereference(in_dev->mc_list); pmc; pmc = rcu_dereference(pmc->next_rcu)) { if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_UNSNOOPABLES && @@ -410,7 +413,6 @@ batadv_mcast_mla_softif_get_ipv4(struct net_device *dev, ret++; } rcu_read_unlock(); - in_dev_put(in_dev); return ret; } @@ -444,11 +446,14 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, if (flags->tvlv_flags & BATADV_MCAST_WANT_ALL_IPV6) return 0; - in6_dev = in6_dev_get(dev); - if (!in6_dev) + 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) @@ -478,8 +483,7 @@ batadv_mcast_mla_softif_get_ipv6(struct net_device *dev, hlist_add_head(&new->list, mcast_list); ret++; } - read_unlock_bh(&in6_dev->lock); - in6_dev_put(in6_dev); + rcu_read_unlock(); return ret; } -- 2.20.1

1 0

[PATCH 00/10] pull request for net-next: batman-adv 2019-06-27
by Simon Wunderlich 27 Jun '19

27 Jun '19

Hi David, here is a feature and cleanup pull request of batman-adv to go into net-next. Please pull or let me know of any problem! Thank you, Simon The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batadv-next-for-davem-20190627 for you to fetch changes up to 8a8a79f53b4210c55557d1148e925b0f385c1bf7: batman-adv: mcast: apply optimizations for routable packets, too (2019-06-14 20:24:11 +0200) ---------------------------------------------------------------- This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - fix includes for _MAX constants, atomic functions and fwdecls, by Sven Eckelmann (3 patches) - shorten multicast tt/tvlv worker spinlock section, by Linus Luessing - routeable multicast preparations: implement MAC multicast filtering, by Linus Luessing (2 patches) - remove return value checks for debugfs_create, by Greg Kroah-Hartman - add routable multicast optimizations, by Linus Luessing (2 patches) ---------------------------------------------------------------- Greg Kroah-Hartman (1): batman-adv: no need to check return value of debugfs_create functions Linus Lüssing (5): batman-adv: mcast: shorten multicast tt/tvlv worker spinlock section batman-adv: mcast: collect softif listeners from IP lists instead batman-adv: mcast: avoid redundant multicast TT entries with bridges batman-adv: mcast: detect, distribute and maintain multicast router presence batman-adv: mcast: apply optimizations for routable packets, too Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (3): batman-adv: Fix includes for *_MAX constants batman-adv: Add missing include for atomic functions batman-adv: Use includes instead of fwdecls include/uapi/linux/batadv_packet.h | 8 + net/batman-adv/bat_algo.h | 7 +- net/batman-adv/bat_v.c | 3 +- net/batman-adv/bat_v_elp.h | 4 +- net/batman-adv/bat_v_ogm.h | 3 +- net/batman-adv/bridge_loop_avoidance.h | 9 +- net/batman-adv/debugfs.c | 99 +-- net/batman-adv/debugfs.h | 9 +- net/batman-adv/distributed-arp-table.h | 7 +- net/batman-adv/fragmentation.h | 3 +- net/batman-adv/gateway_client.h | 9 +- net/batman-adv/gateway_common.c | 1 + net/batman-adv/gateway_common.h | 3 +- net/batman-adv/hard-interface.c | 7 +- net/batman-adv/hard-interface.h | 5 +- net/batman-adv/hash.h | 3 +- net/batman-adv/icmp_socket.c | 20 +- net/batman-adv/icmp_socket.h | 5 +- net/batman-adv/log.c | 17 +- net/batman-adv/log.h | 1 + net/batman-adv/main.h | 12 +- net/batman-adv/multicast.c | 1086 +++++++++++++++++++++++++------- net/batman-adv/multicast.h | 6 +- net/batman-adv/netlink.c | 4 +- net/batman-adv/netlink.h | 3 +- net/batman-adv/network-coding.c | 29 +- net/batman-adv/network-coding.h | 14 +- net/batman-adv/originator.c | 4 +- net/batman-adv/originator.h | 7 +- net/batman-adv/routing.h | 3 +- net/batman-adv/send.h | 3 +- net/batman-adv/soft-interface.c | 6 +- net/batman-adv/soft-interface.h | 7 +- net/batman-adv/sysfs.c | 1 + net/batman-adv/sysfs.h | 5 +- net/batman-adv/tp_meter.c | 1 + net/batman-adv/tp_meter.h | 3 +- net/batman-adv/translation-table.h | 9 +- net/batman-adv/tvlv.h | 3 +- net/batman-adv/types.h | 69 +- 40 files changed, 1035 insertions(+), 463 deletions(-)

2 11

Problem with routing table
by faycel.benhajkhalifa＠eisox.com 25 Jun '19

25 Jun '19

Hello I have a problem with setting up the routing table the use case I have 4 node with batman batctl 2018.1 [batman-adv: 2018.1] on openwrt 18.06.1 2 nodes that serve the internet (connected directly with cable) when a node that shares the internet is dead the other node can't ping the internet unless the dead node no longer exists in its database neighbors (it does not appear in the results of batctl o and batctl n ) on average it takes a little more than 200 s to reconnect to the internet. my questions are: Is it possible to update the routing table faster? Does it have anything to do with 200s to detect that a node and dead ? thank you cordially faycel bhk

1 0

[PATCH v5 0/2] batman-adv: Add routable multicast optimizations
by Linus Lüssing 23 Jun '19

23 Jun '19

The following patchset fills the next gaps in the multicast address rules page by adding support for group-aware optimizations for multicast addresses of scope greater than link-local. So far, only link-local addresses were optimized as packets with routable addresses not only need to be forwarded to local multicast listeners but also multicast routers. "Handling rules depending on multicast address:" [0] Before: * Ipv4, link-local: supported without bridges * IPv6, link-local: supported * IPv4, routable: support planned. * IPv6, routable: support planned. After: * Ipv4, link-local: supported without bridges * IPv6, link-local: supported * IPv4, routable: supported without bridges. * IPv6, routable: supported. Patch 1 adds the detection of multicast routers and announces them via two new flags in its multicast TVLV. TVLV receivers will memorize this and fill lists similar to how we already do for the WANT_ALL_IPV4/IPV6 flags. Currently the detection for bridged-in IPv6 multicast routers is not quite what the RFC for multicast router discovery suggests. But once the MRD implementation in the Linux bridge has matured a bit, I'm going to swap this simplified approach with tapping into the bridge once more, asking the bridge for the presence of multicast routers on the link. (This will then also add support for "IPv4, routable, with bridges") Then patch 2 implements the changes to the forwarding plane, utilizing the new information we have gathered with the second patch. Regards, Linus [0]: https://www.open-mesh.org/projects/batman-adv/wiki/Multicast-optimizations-… --- Changelog v5: * updated commit message of [PATCH 1/2] with BATADV_MCAST_WANT_ALL_RTR{4,6} -> BATADV_MCAST_WANT_NO_RTR{4,6} * now unsetting BATADV_MCAST_WANT_NO_RTR{4,6} in own tvlv flags (batadv_mcast_mla_flags_get() ) if BATADV_MCAST_WANT_ALL_IPV{4,6} is already set, to be able to reuse this combination to signalize want-all-link-local in the future - [PATCH 1/2] * "routeable" -> "routable" Changelog v4: * rebased to master * BATADV_MCAST_WANT_ALL_RTR{4,6} -> BATADV_MCAST_WANT_NO_RTR{4,6} => swapped the name of this flag and according logic in the code in [PATCH 1/2] => swapped the name in the kerneldoc in [PATCH 2/2] Changelog v3: * rebased to master + routeable multicast preparations v4 * fixed build errors with CONFIG_IPV6_MROUTE disabled * fixed build errors with CONFIG_IPV6 disabled Changelog v2: * rebased to master * split patchset in two with the intention to ease reviewing (no code changes, just the last two patches here) * removed unncessarilly added newline in batadv_mcast_flags_log() [PATCH 5/6] / [PATCH v2 1/2] * kerneldoc: @BATADV_MCAST_NO_WANT_ALL_RTR6 -> -"NO_" in enum batadv_mcast_flags [PATCH 5/6] / [PATCH v2 1/2]

2 4

[PATCH 1/2] alfred: vis: Use rtnl to query list of hardifs of meshif
by Sven Eckelmann 19 Jun '19

19 Jun '19

The normal way of network related programs to query the state of interfaces is to use the rtnetlink. Most of these data can also be queried via sysfs but it is better to use the same way for both retrieving the list of interfaces and modifying the list of interfaces. Also the sysfs files are deprecated and cause warnings when access: batman_adv: [Deprecated]: batadv-vis (pid 832) Use of sysfs file "mesh_iface". Use batadv genl family instead In worst case, the file doesn't even exist when batman-adv was compiled without sysfs support. Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- vis/vis.c | 170 +++++++++++++++++++++++++++++++++++++++--------------- vis/vis.h | 1 - 2 files changed, 123 insertions(+), 48 deletions(-) diff --git a/vis/vis.c b/vis/vis.c index beaeca1..37956b1 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -372,70 +372,146 @@ static void clear_lists(struct globals *globals) } } -static int register_interfaces(struct globals *globals) +static int query_rtnl_link(int ifindex, nl_recvmsg_msg_cb_t func, void *arg) { - DIR *iface_base_dir; - struct dirent *iface_dir; - char *path_buff, *file_content; - char *content_newline; + struct ifinfomsg rt_hdr = { + .ifi_family = IFLA_UNSPEC, + }; + struct nl_sock *sock; + struct nl_msg *msg; + struct nl_cb *cb; + int err = 0; + int ret; - path_buff = malloc(PATH_BUFF_LEN); - if (!path_buff) { - perror("Error - could not allocate path buffer"); - goto err; + sock = nl_socket_alloc(); + if (!sock) + return -ENOMEM; + + ret = nl_connect(sock, NETLINK_ROUTE); + if (ret < 0) { + err = -ENOMEM; + goto err_free_sock; } - iface_base_dir = opendir(SYS_IFACE_PATH); - if (!iface_base_dir) { - fprintf(stderr, "Error - the directory '%s' could not be read: %s\n", - SYS_IFACE_PATH, strerror(errno)); - fprintf(stderr, "Is the batman-adv module loaded and sysfs mounted ?\n"); - goto err_buff; + cb = nl_cb_alloc(NL_CB_DEFAULT); + if (!cb) { + err = -ENOMEM; + goto err_free_sock; } - while ((iface_dir = readdir(iface_base_dir)) != NULL) { - snprintf(path_buff, PATH_BUFF_LEN, SYS_MESH_IFACE_FMT, iface_dir->d_name); - file_content = read_file(path_buff); - if (!file_content) - continue; + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, func, arg); - if (file_content[strlen(file_content) - 1] == '\n') - file_content[strlen(file_content) - 1] = '\0'; + msg = nlmsg_alloc_simple(RTM_GETLINK, NLM_F_REQUEST | NLM_F_DUMP); + if (!msg) { + err = -ENOMEM; + goto err_free_cb; + } - if (strcmp(file_content, "none") == 0) - goto free_line; + ret = nlmsg_append(msg, &rt_hdr, sizeof(rt_hdr), NLMSG_ALIGNTO); + if (ret < 0) { + err = -ENOMEM; + goto err_free_msg; + } - if (strcmp(file_content, globals->interface) != 0) - goto free_line; + ret = nla_put_u32(msg, IFLA_MASTER, ifindex); + if (ret < 0) { + err = -ENOMEM; + goto err_free_msg; + } - free(file_content); - file_content = NULL; + ret = nl_send_auto_complete(sock, msg); + if (ret < 0) + goto err_free_msg; - snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, iface_dir->d_name); - file_content = read_file(path_buff); - if (!file_content) - continue; + nl_recvmsgs(sock, cb); - content_newline = strstr(file_content, "\n"); - if (content_newline) - *content_newline = '\0'; +err_free_msg: + nlmsg_free(msg); +err_free_cb: + nl_cb_put(cb); +err_free_sock: + nl_socket_free(sock); - if (strcmp(file_content, "active") == 0) - get_if_index_byname(globals, iface_dir->d_name); + return err; +} -free_line: - free(file_content); - file_content = NULL; - } +struct register_interfaces_rtnl_arg { + struct globals *globals; + int ifindex; +}; - free(path_buff); - closedir(iface_base_dir); - return EXIT_SUCCESS; +static struct nla_policy link_policy[IFLA_MAX + 1] = { + [IFLA_IFNAME] = { .type = NLA_STRING, .maxlen = IFNAMSIZ }, + [IFLA_MASTER] = { .type = NLA_U32 }, +}; + +static int register_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) +{ + struct register_interfaces_rtnl_arg *register_arg = arg; + struct nlattr *attrs[IFLA_MAX + 1]; + char path_buff[PATH_BUFF_LEN]; + struct ifinfomsg *ifm; + char *content_newline; + char *file_content; + char *ifname; + int master; + int ret; + + ifm = nlmsg_data(nlmsg_hdr(msg)); + ret = nlmsg_parse(nlmsg_hdr(msg), sizeof(*ifm), attrs, IFLA_MAX, + link_policy); + if (ret < 0) + goto err; + + if (!attrs[IFLA_IFNAME]) + goto err; + + if (!attrs[IFLA_MASTER]) + goto err; + + ifname = nla_get_string(attrs[IFLA_IFNAME]); + master = nla_get_u32(attrs[IFLA_MASTER]); + + /* required on older kernels which don't prefilter the results */ + if (master != register_arg->ifindex) + goto err; + + snprintf(path_buff, PATH_BUFF_LEN, SYS_IFACE_STATUS_FMT, ifname); + file_content = read_file(path_buff); + if (!file_content) + goto free_file; + + content_newline = strstr(file_content, "\n"); + if (content_newline) + *content_newline = '\0'; + + if (strcmp(file_content, "active") != 0) + goto err; + + get_if_index_byname(register_arg->globals, ifname); -err_buff: - free(path_buff); +free_file: + free(file_content); + file_content = NULL; err: - return EXIT_FAILURE; + return NL_OK; +} + +static int register_interfaces(struct globals *globals) +{ + struct register_interfaces_rtnl_arg register_arg = { + .globals = globals, + }; + + register_arg.ifindex = if_nametoindex(globals->interface); + if (!globals->interface) + return EXIT_FAILURE; + + + query_rtnl_link(register_arg.ifindex, register_interfaces_rtnl_parse, + &register_arg); + + return EXIT_SUCCESS; } static const int parse_orig_list_mandatory[] = { diff --git a/vis/vis.h b/vis/vis.h index 178406c..36bdecc 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -25,7 +25,6 @@ #define SYS_IFACE_PATH "/sys/class/net" #define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s" -#define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" -- 2.20.1

1 1

[PATCH] batctl: Prefer netlink hardif status retrieval over sysfs
by Sven Eckelmann 19 Jun '19

19 Jun '19

The sysfs code in batman-adv was changed to print a deprecated warning when sysfs files are accessed. The `batctl if` call would therefore cause warnings like this in the kernel log: batman_adv: [Deprecated]: batctl (pid 18540) Use of sysfs file "iface_status". Use batadv genl family instead It is now appropriate to try the generic netlink BATADV_CMD_GET_HARDIF request first to get the status of the interface before falling back to sysfs. Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- interface.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/interface.c b/interface.c index 5ff25a7..0a694c9 100644 --- a/interface.c +++ b/interface.c @@ -67,18 +67,18 @@ static int get_iface_status_netlink_parse(struct nl_msg *msg, void *arg) static char *get_iface_status_netlink(unsigned int meshif, unsigned int hardif, char *iface_status) { + char *ret_status = NULL; struct nl_sock *sock; struct nl_msg *msg; int batadv_family; struct nl_cb *cb; int ret; - strncpy(iface_status, "<error reading status>\n", IFACE_STATUS_LEN); - iface_status[IFACE_STATUS_LEN - 1] = '\0'; + iface_status[0] = '\0'; sock = nl_socket_alloc(); if (!sock) - return iface_status; + return NULL; ret = genl_connect(sock); if (ret < 0) @@ -111,6 +111,9 @@ static char *get_iface_status_netlink(unsigned int meshif, unsigned int hardif, nl_recvmsgs(sock, cb); + if (strlen(iface_status) > 0) + ret_status = iface_status; + err_free_msg: nlmsg_free(msg); err_free_cb: @@ -118,7 +121,7 @@ static char *get_iface_status_netlink(unsigned int meshif, unsigned int hardif, err_free_sock: nl_socket_free(sock); - return iface_status; + return ret_status; } static struct nla_policy link_policy[IFLA_MAX + 1] = { @@ -161,13 +164,17 @@ static int print_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) if (master != print_arg->ifindex) goto err; - snprintf(path_buff, sizeof(path_buff), SYS_IFACE_STATUS_FMT, ifname); - ret = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, 0, 0, 0); - if (ret != EXIT_SUCCESS) - status = get_iface_status_netlink(master, ifm->ifi_index, - iface_status); - else - status = line_ptr; + status = get_iface_status_netlink(master, ifm->ifi_index, iface_status); + if (!status) { + snprintf(path_buff, sizeof(path_buff), SYS_IFACE_STATUS_FMT, + ifname); + ret = read_file("", path_buff, USE_READ_BUFF | SILENCE_ERRORS, + 0, 0, 0); + if (ret != EXIT_SUCCESS) + status = "<error reading status>\n"; + else + status = line_ptr; + } printf("%s: %s", ifname, status); -- 2.20.1

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N