Repository : ssh://git@diktynna/batctl
On branch : master
commit 86b57e4746d74285e406117097a78e00abc64639 Author: Sven Eckelmann sven@narfation.org Date: Fri May 14 16:23:03 2021 +0200
batctl: Add hardifs_json command
Signed-off-by: Sven Eckelmann sven@narfation.org
86b57e4746d74285e406117097a78e00abc64639 Makefile | 1 + README.rst | 39 +++++++++++++++++++++++++++++++++++++++ gateways_json.c => hardifs_json.c | 8 ++++---- man/batctl.8 | 3 +++ 4 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index 4a2de53..a304c18 100755 --- a/Makefile +++ b/Makefile @@ -55,6 +55,7 @@ $(eval $(call add_command,gateways,y)) $(eval $(call add_command,gateways_json,y)) $(eval $(call add_command,gw_mode,y)) $(eval $(call add_command,hardif_json,y)) +$(eval $(call add_command,hardifs_json,y)) $(eval $(call add_command,hop_penalty,y)) $(eval $(call add_command,interface,y)) $(eval $(call add_command,isolation_mark,y)) diff --git a/README.rst b/README.rst index 54e68d5..e40f07e 100644 --- a/README.rst +++ b/README.rst @@ -878,6 +878,45 @@ Example:: }
+batctl hardifs_json +-------------------- + +Query batman-adv for entries in the list of interfaces added to a batadv +interface. + +Usage:: + + batctl meshif <netdev> hardifs_json|hj + +Example:: + + $ batctl meshif bat0 hardifs_json | json_pp + [ + { + "active": true, + "elp_interval": 500, + "hard_address": "4a:97:a4:b8:fc:17", + "hard_ifindex": 2, + "hard_ifname": "dummy0", + "hop_penalty": 0, + "mesh_ifindex": 9, + "mesh_ifname": "bat0", + "throughput_override": 0 + }, + { + "active": true, + "elp_interval": 500, + "hard_address": "02:ba:de:af:fe:01", + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "hop_penalty": 0, + "mesh_ifindex": 9, + "mesh_ifname": "bat0", + "throughput_override": 0 + } + ] + + Advanced Analytics ==================
diff --git a/gateways_json.c b/hardifs_json.c similarity index 60% copy from gateways_json.c copy to hardifs_json.c index 3ab75da..3b37967 100644 --- a/gateways_json.c +++ b/hardifs_json.c @@ -10,11 +10,11 @@
#include "genl_json.h"
-static struct json_query_data batctl_json_query_gateways = { +static struct json_query_data batctl_json_query_hardifs = { .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_GATEWAYS, + .cmd = BATADV_CMD_GET_HARDIFS, };
-COMMAND_NAMED(JSON_MIF, gateways_json, "gwj", handle_json_query, +COMMAND_NAMED(JSON_MIF, hardifs_json, "hj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_gateways, ""); + &batctl_json_query_hardifs, ""); diff --git a/man/batctl.8 b/man/batctl.8 index 1aa956a..818fc45 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -320,6 +320,9 @@ List of available JSON queries: .RS 10 - hardif_json|hj .RE +.RS 10 +- hardifs_json|hj +.RE .RE .br .IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat-host_name\fP|\fBhost_name\fP|\fBIP_address\fP"