Repository : ssh://git@diktynna/batctl
On branch : master
commit 5df90bdf970fe264ed511ab110ce93dc34fb445b Author: Sven Eckelmann sven@narfation.org Date: Fri May 14 16:23:03 2021 +0200
batctl: Add hardif_json command
Signed-off-by: Sven Eckelmann sven@narfation.org
5df90bdf970fe264ed511ab110ce93dc34fb445b Makefile | 1 + README.rst | 26 ++++++++++++++++++++++++++ gateways_json.c => hardif_json.c | 10 +++++----- man/batctl.8 | 3 +++ 4 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile index 091ee9d..4a2de53 100755 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ $(eval $(call add_command,fragmentation,y)) $(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,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 6fc3e15..54e68d5 100644 --- a/README.rst +++ b/README.rst @@ -852,6 +852,32 @@ Example:: ]
+batctl hardif_json +------------------ + +Read the interface state for an interface which is part of a batman-adv +interface. + +Usage:: + + batctl hardif <netdev> hardif_json|hj + +Example:: + + $ batctl hardif enp0s1 hardif_json | json_pp + { + "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/hardif_json.c similarity index 55% copy from gateways_json.c copy to hardif_json.c index 3ab75da..61fdc2f 100644 --- a/gateways_json.c +++ b/hardif_json.c @@ -10,11 +10,11 @@
#include "genl_json.h"
-static struct json_query_data batctl_json_query_gateways = { - .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_GATEWAYS, +static struct json_query_data batctl_json_query_hardif = { + .nlm_flags = 0, + .cmd = BATADV_CMD_GET_HARDIF, };
-COMMAND_NAMED(JSON_MIF, gateways_json, "gwj", handle_json_query, +COMMAND_NAMED(JSON_HIF, hardif_json, "hj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_gateways, ""); + &batctl_json_query_hardif, ""); diff --git a/man/batctl.8 b/man/batctl.8 index 3fff6fc..1aa956a 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -317,6 +317,9 @@ List of available JSON queries: .RS 10 - gateways_json|gwj .RE +.RS 10 +- hardif_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"