mirror of
https://github.com/openwrt/routing.git
synced 2025-02-23 09:16:14 +00:00
984bbe393c
The netlink_print_neighbors() function previously used a static header format, which did not account for variations between the neighbor list output from different BATMAN routing algorithms (BATMAN_IV vs. BATMAN_V). This change ensures that the table header output in `batctl n` is accurate for both BATMAN routing algorithms. Signed-off-by: Sven Eckelmann <sven@narfation.org>
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From: Noah Peterson <NoahBPeterson1997@gmail.com>
|
|
Date: Tue, 10 Sep 2024 13:22:02 -0600
|
|
Subject: batctl: Dynamically select header format in netlink_print_neighbors
|
|
|
|
The netlink_print_neighbors() function previously used a static header
|
|
format, which did not account for variations between the neighbor list
|
|
output from different BATMAN routing algorithms (BATMAN_IV vs. BATMAN_V).
|
|
|
|
This change ensures that the table header output in `batctl n` is accurate
|
|
for both BATMAN routing algorithms.
|
|
|
|
Signed-off-by: Noah Peterson <noahbpeterson1997@gmail.com>
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
Origin: upstream, https://git.open-mesh.org/batctl.git/commit/649456d9d00cf701eb35cee1c8c5442752c70613
|
|
|
|
--- a/neighbors.c
|
|
+++ b/neighbors.c
|
|
@@ -6,6 +6,7 @@
|
|
* License-Filename: LICENSES/preferred/GPL-2.0
|
|
*/
|
|
|
|
+#include <errno.h>
|
|
#include <net/if.h>
|
|
#include <netinet/if_ether.h>
|
|
#include <netlink/netlink.h>
|
|
@@ -119,9 +120,28 @@ static int netlink_print_neighbors(struc
|
|
int read_opts, float orig_timeout,
|
|
float watch_interval)
|
|
{
|
|
+ char *header = NULL;
|
|
+ char *info_header;
|
|
+
|
|
+ /* only parse routing algorithm name */
|
|
+ last_err = -EINVAL;
|
|
+ info_header = netlink_get_info(state, 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 = "IF Neighbor last-seen\n";
|
|
+ if (!strcmp("BATMAN_V", algo_name_buf))
|
|
+ header = " Neighbor last-seen speed IF\n";
|
|
+
|
|
+ if (!header)
|
|
+ return -EINVAL;
|
|
+
|
|
return netlink_print_common(state, orig_iface, read_opts,
|
|
orig_timeout, watch_interval,
|
|
- "IF Neighbor last-seen\n",
|
|
+ header,
|
|
BATADV_CMD_GET_NEIGHBORS,
|
|
neighbors_callback);
|
|
}
|