This is wrong, this is not what it outputs for the default B.A.T.M.A.N. IV:
Oops. I believe I now have this issue corrected. I copied the routing algorithm checking code from the netlink_print_gateways() function in gateways.c and change the header accordingly. Let me know if I should revert the change in README.rst. --- README.rst | 6 +++--- neighbors.c | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/README.rst b/README.rst index 3495fba..5eda1d3 100644 --- a/README.rst +++ b/README.rst @@ -376,9 +376,9 @@ Usage::
Example::
- IF Neighbor last-seen - enp0s1 16:7b:3c:c2:bf:b8 4.612s - enp0s1 ae:1b:bf:52:25:58 0.740s + Neighbor last-seen speed IF + 16:7b:3c:c2:bf:b8 4.612s ( 1000.0) [ enp0s1] + ae:1b:bf:52:25:58 0.740s ( 1000.0) [ enp0s1]
batctl originators diff --git a/neighbors.c b/neighbors.c index 3102b0e..f34952b 100644 --- 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(struct state *state, char *orig_iface, 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); }