commits

commits@lists.open-mesh.org

1 participants
12399 discussions

[batctl] master: batctl: Add transtable_local_json command (20086d2)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 20086d207940f3dd2d01a8f313316d93bccae932 Author: Alexander Sarmanow <asarmanow(a)gmail.com> Date: Thu May 13 16:28:12 2021 +0200 batctl: Add transtable_local_json command Signed-off-by: Alexander Sarmanow <asarmanow(a)gmail.com> [sven(a)narfation.org: Reimplement with shared json query helpers] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 20086d207940f3dd2d01a8f313316d93bccae932 Makefile | 1 + README.rst | 97 +++++++++++++++++++++++++++++ man/batctl.8 | 3 + neighbors_json.c => transtable_local_json.c | 8 +-- 4 files changed, 105 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1d5d6fa..15a88a5 100755 --- a/Makefile +++ b/Makefile @@ -83,6 +83,7 @@ $(eval $(call add_command,transglobal,y)) $(eval $(call add_command,translate,y)) $(eval $(call add_command,translocal,y)) $(eval $(call add_command,transtable_global_json,y)) +$(eval $(call add_command,transtable_local_json,y)) MANPAGE = man/batctl.8 diff --git a/README.rst b/README.rst index 4e37771..9346378 100644 --- a/README.rst +++ b/README.rst @@ -1187,6 +1187,103 @@ Example:: [...] +batctl transtable_local_json +---------------------------- + +Query batman-adv for the entries in the (mac-to-originator) translation +table for locally detected MAC addresses. + +Usage:: + + batctl meshif <netdev> transtable_local_json|tgj + +Example:: + + $ batctl meshif bat0 transtable_local_json + [ + { + "tt_address": "3e:dc:94:68:80:e8", + "tt_crc32": 3361904636, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": true, + "pending": false, + "raw": 256, + "roam": false, + "temp": false, + "wifi": false + }, + "tt_vid": -1 + }, + { + "tt_address": "3e:dc:94:68:80:e8", + "tt_crc32": 1436598566, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": true, + "pending": false, + "raw": 256, + "roam": false, + "temp": false, + "wifi": false + }, + "tt_vid": 0 + }, + { + "tt_address": "01:00:5e:00:00:01", + "tt_crc32": 3361904636, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": true, + "pending": false, + "raw": 256, + "roam": false, + "temp": false, + "wifi": false + }, + "tt_vid": -1 + }, + { + "tt_address": "33:33:ff:68:80:e8", + "tt_crc32": 3361904636, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": true, + "pending": false, + "raw": 256, + "roam": false, + "temp": false, + "wifi": false + }, + "tt_vid": -1 + }, + { + "tt_address": "33:33:00:00:00:01", + "tt_crc32": 3361904636, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": true, + "pending": false, + "raw": 256, + "roam": false, + "temp": false, + "wifi": false + }, + "tt_vid": -1 + } + ] + + Advanced Analytics ================== diff --git a/man/batctl.8 b/man/batctl.8 index 79f7437..6abeb08 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -339,6 +339,9 @@ List of available JSON queries: \- transtable_global_json|tgj .RE .RE +\- transtable_local_json|tlj +.RE +.RS 10 .br .IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" diff --git a/neighbors_json.c b/transtable_local_json.c similarity index 57% copy from neighbors_json.c copy to transtable_local_json.c index 6c9bdc3..0b2f124 100644 --- a/neighbors_json.c +++ b/transtable_local_json.c @@ -10,11 +10,11 @@ #include "genl_json.h" -static struct json_query_data batctl_json_query_neighbors = { +static struct json_query_data batctl_json_query_transtable_local = { .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_NEIGHBORS, + .cmd = BATADV_CMD_GET_TRANSTABLE_LOCAL, }; -COMMAND_NAMED(JSON_MIF, neighbors_json, "nj", handle_json_query, +COMMAND_NAMED(JSON_MIF, transtable_local_json, "tlj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_neighbors, ""); + &batctl_json_query_transtable_local, "");

1 0

[batctl] master: batctl: Add originators_json command (45eb2ac)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 45eb2ac69d64c6c6d2c93aaf497ca52b3f4bf3d1 Author: Alexander Sarmanow <asarmanow(a)gmail.com> Date: Thu May 13 16:28:09 2021 +0200 batctl: Add originators_json command Signed-off-by: Alexander Sarmanow <asarmanow(a)gmail.com> [sven(a)narfation.org: Reimplement with shared json query helpers] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 45eb2ac69d64c6c6d2c93aaf497ca52b3f4bf3d1 Makefile | 1 + README.rst | 45 ++++++++++++++++++++++++++++++++++ man/batctl.8 | 3 +++ neighbors_json.c => originators_json.c | 8 +++--- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 97790ce..b920d01 100755 --- a/Makefile +++ b/Makefile @@ -71,6 +71,7 @@ $(eval $(call add_command,neighbors_json,y)) $(eval $(call add_command,network_coding,y)) $(eval $(call add_command,orig_interval,y)) $(eval $(call add_command,originators,y)) +$(eval $(call add_command,originators_json,y)) $(eval $(call add_command,ping,y)) $(eval $(call add_command,routing_algo,y)) $(eval $(call add_command,statistics,y)) diff --git a/README.rst b/README.rst index ce22087..606739f 100644 --- a/README.rst +++ b/README.rst @@ -1066,6 +1066,51 @@ Example:: ] +batctl originators_json +----------------------- + +Query batman-adv for the entries in the originators table. The table doesn't +only contain the list of best next hops but also all other known entries. +Only next best hops have the key-value ``"best": true``. + +Usage:: + + batctl meshif <netdev> originators_json|oj + +Example:: + + $ batctl meshif bat0 originators_json | json_pp + [ + { + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "last_seen_msecs": 4380, + "neigh_address": "ae:1b:bf:52:25:58", + "orig_address": "16:7b:3c:c2:bf:b8", + "tq": 236 + }, + { + "best": true, + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "last_seen_msecs": 4380, + "neigh_address": "16:7b:3c:c2:bf:b8", + "orig_address": "16:7b:3c:c2:bf:b8", + "tq": 251 + }, + [...] + { + "best": true, + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "last_seen_msecs": 4728, + "neigh_address": "ae:1b:bf:52:25:58", + "orig_address": "12:6d:7d:6f:f9:03", + "tq": 77 + } + ] + + Advanced Analytics ================== diff --git a/man/batctl.8 b/man/batctl.8 index 826d21c..3b50dc0 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -332,6 +332,9 @@ List of available JSON queries: .RS 10 \- neighbors_json|nj .RE +.RS 10 +\- originators_json|oj +.RE .RE .br .IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" diff --git a/neighbors_json.c b/originators_json.c similarity index 59% copy from neighbors_json.c copy to originators_json.c index 6c9bdc3..5617029 100644 --- a/neighbors_json.c +++ b/originators_json.c @@ -10,11 +10,11 @@ #include "genl_json.h" -static struct json_query_data batctl_json_query_neighbors = { +static struct json_query_data batctl_json_query_originators = { .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_NEIGHBORS, + .cmd = BATADV_CMD_GET_ORIGINATORS, }; -COMMAND_NAMED(JSON_MIF, neighbors_json, "nj", handle_json_query, +COMMAND_NAMED(JSON_MIF, originators_json, "oj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_neighbors, ""); + &batctl_json_query_originators, "");

1 0

[batctl] master: batctl: Add neighbors_json command (ffce54a)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit ffce54add033bb1b34806a97771ac63d4a1c7bef Author: Alexander Sarmanow <asarmanow(a)gmail.com> Date: Thu May 13 16:28:10 2021 +0200 batctl: Add neighbors_json command Signed-off-by: Alexander Sarmanow <asarmanow(a)gmail.com> [sven(a)narfation.org: Reimplement with shared json query helpers] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ffce54add033bb1b34806a97771ac63d4a1c7bef Makefile | 1 + README.rst | 28 ++++++++++++++++++++++++++++ man/batctl.8 | 3 +++ gateways_json.c => neighbors_json.c | 10 +++++----- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 478e767..97790ce 100755 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ $(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,multicast_forceflood,y)) $(eval $(call add_command,multicast_mode,y)) $(eval $(call add_command,neighbors,y)) +$(eval $(call add_command,neighbors_json,y)) $(eval $(call add_command,network_coding,y)) $(eval $(call add_command,orig_interval,y)) $(eval $(call add_command,originators,y)) diff --git a/README.rst b/README.rst index 674c574..ce22087 100644 --- a/README.rst +++ b/README.rst @@ -1038,6 +1038,34 @@ Example:: } +batctl neighbors_json +--------------------- + +Query batman-adv for the entries in the (direct) neighbors table. + +Usage:: + + batctl meshif <netdev> neighbors_json|nj + +Example:: + + $ batctl meshif bat0 neighbors_json + [ + { + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "last_seen_msecs": 708, + "neigh_address": "16:7b:3c:c2:bf:b8" + }, + { + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "last_seen_msecs": 1872, + "neigh_address": "ae:1b:bf:52:25:58" + } + ] + + Advanced Analytics ================== diff --git a/man/batctl.8 b/man/batctl.8 index 915bde0..826d21c 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -329,6 +329,9 @@ List of available JSON queries: .RS 10 \- mesh_json|mj .RE +.RS 10 +\- neighbors_json|nj +.RE .RE .br .IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" diff --git a/gateways_json.c b/neighbors_json.c similarity index 52% copy from gateways_json.c copy to neighbors_json.c index 3ab75da..6c9bdc3 100644 --- a/gateways_json.c +++ b/neighbors_json.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (C) B.A.T.M.A.N. contributors: * - * Sven Eckelmann <sven(a)narfation.org + * Alexander Sarmanow <asarmanow(a)gmail.com> * * License-Filename: LICENSES/preferred/GPL-2.0 */ @@ -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_neighbors = { .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_GATEWAYS, + .cmd = BATADV_CMD_GET_NEIGHBORS, }; -COMMAND_NAMED(JSON_MIF, gateways_json, "gwj", handle_json_query, +COMMAND_NAMED(JSON_MIF, neighbors_json, "nj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_gateways, ""); + &batctl_json_query_neighbors, "");

1 0

[batctl] master: batctl: Add gateways_json command (cce6890)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit cce68903508d85e2d1d242b046caadc4867aee58 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 16:23:03 2021 +0200 batctl: Add gateways_json command Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- cce68903508d85e2d1d242b046caadc4867aee58 Makefile | 1 + README.rst | 46 +++++++++++++++++++++++++++++++++++++ dat_cache_json.c => gateways_json.c | 8 +++---- man/batctl.8 | 3 +++ 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0c91b66..091ee9d 100755 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ $(eval $(call add_command,elp_interval,y)) $(eval $(call add_command,event,y)) $(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,hop_penalty,y)) $(eval $(call add_command,interface,y)) diff --git a/README.rst b/README.rst index a4c7ab1..6fc3e15 100644 --- a/README.rst +++ b/README.rst @@ -806,6 +806,52 @@ Example:: ] +batctl gateways_json +-------------------- + +Query batman-adv for the entries in the gateways list. Only selected gateways +(for the gateway mode "client) will have have the key-value ``"best": true``. + +Usage:: + + batctl meshif <netdev> gateways_json|gwj + +Example:: + + $ batctl meshif bat0 gateways_json | json_pp + [ + { + "bandwidth_down": 100, + "bandwidth_up": 20, + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "orig_address": "02:62:e7:ab:01:01", + "router": "ae:1b:bf:52:25:58", + "tq": 180 + }, + { + "bandwidth_down": 100, + "bandwidth_up": 20, + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "orig_address": "02:62:e7:ab:05:01", + "router": "ae:1b:bf:52:25:58", + "tq": 180 + }, + { + "bandwidth_down": 100, + "bandwidth_up": 20, + "best": true, + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "orig_address": "02:62:e7:ab:06:01", + "router": "ae:1b:bf:52:25:58", + "tq": 236 + }, + [...] + ] + + Advanced Analytics ================== diff --git a/dat_cache_json.c b/gateways_json.c similarity index 59% copy from dat_cache_json.c copy to gateways_json.c index 4dcefd0..3ab75da 100644 --- a/dat_cache_json.c +++ b/gateways_json.c @@ -10,11 +10,11 @@ #include "genl_json.h" -static struct json_query_data batctl_json_query_dat_cache = { +static struct json_query_data batctl_json_query_gateways = { .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_DAT_CACHE, + .cmd = BATADV_CMD_GET_GATEWAYS, }; -COMMAND_NAMED(JSON_MIF, dat_cache_json, "dcj", handle_json_query, +COMMAND_NAMED(JSON_MIF, gateways_json, "gwj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_dat_cache, ""); + &batctl_json_query_gateways, ""); diff --git a/man/batctl.8 b/man/batctl.8 index dafd1bd..3fff6fc 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -314,6 +314,9 @@ List of available JSON queries: .RS 10 \- dat_cache_json|dcj .RE +.RS 10 +\- gateways_json|gwj +.RE .RE .br .IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP"

1 0

[batctl] master: batctl: Add hardif_json command (5df90bd)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 5df90bdf970fe264ed511ab110ce93dc34fb445b Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 16:23:03 2021 +0200 batctl: Add hardif_json command Signed-off-by: Sven Eckelmann <sven(a)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"

1 0

[batctl] master: batctl: Add transtable_global_json command (4a4c54e)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 4a4c54e50d981b17d92789f76231e565a3823e3a Author: Alexander Sarmanow <asarmanow(a)gmail.com> Date: Thu May 13 16:28:11 2021 +0200 batctl: Add transtable_global_json command Signed-off-by: Alexander Sarmanow <asarmanow(a)gmail.com> [sven(a)narfation.org: Reimplement with shared json query helpers] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4a4c54e50d981b17d92789f76231e565a3823e3a Makefile | 1 + README.rst | 76 ++++++++++++++++++++++++++++ man/batctl.8 | 3 ++ neighbors_json.c => transtable_global_json.c | 8 +-- 4 files changed, 84 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b920d01..1d5d6fa 100755 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ $(eval $(call add_command,traceroute,y)) $(eval $(call add_command,transglobal,y)) $(eval $(call add_command,translate,y)) $(eval $(call add_command,translocal,y)) +$(eval $(call add_command,transtable_global_json,y)) MANPAGE = man/batctl.8 diff --git a/README.rst b/README.rst index 606739f..4e37771 100644 --- a/README.rst +++ b/README.rst @@ -1111,6 +1111,82 @@ Example:: ] +batctl transtable_global_json +----------------------------- + +Query batman-adv for the entries in the global (mac-to-originator) translation +table. Only next best hops have the key-value ``"best": true``. + +Usage:: + + batctl meshif <netdev> transtable_global_json|tgj + +Example:: + + $ batctl meshif bat0 transtable_global_json + [ + { + "best": true, + "orig_address": "ea:88:36:b0:fa:4b", + "tt_address": "1e:df:a8:43:c4:d5", + "tt_crc32": 3191293109, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": false, + "pending": false, + "raw": 2048, + "roam": false, + "temp": true, + "wifi": false + }, + "tt_last_ttvn": 255, + "tt_ttvn": 255, + "tt_vid": -1 + }, + { + "best": true, + "orig_address": "6a:d0:7f:eb:86:83", + "tt_address": "01:00:5e:7f:ff:fa", + "tt_crc32": 2358926211, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": false, + "pending": false, + "raw": 0, + "roam": false, + "temp": false, + "wifi": false + }, + "tt_last_ttvn": 246, + "tt_ttvn": 245, + "tt_vid": -1 + }, + { + "orig_address": "0e:68:8c:7c:0f:1b", + "tt_address": "01:00:5e:7f:ff:fa", + "tt_crc32": 1334456817, + "tt_flags": { + "del": false, + "isolated": false, + "new": false, + "nopurge": false, + "pending": false, + "raw": 0, + "roam": false, + "temp": false, + "wifi": false + }, + "tt_last_ttvn": 21, + "tt_ttvn": 20, + "tt_vid": -1 + }, + [...] + + Advanced Analytics ================== diff --git a/man/batctl.8 b/man/batctl.8 index 3b50dc0..79f7437 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -335,6 +335,9 @@ List of available JSON queries: .RS 10 \- originators_json|oj .RE +.RS 10 +\- transtable_global_json|tgj +.RE .RE .br .IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" diff --git a/neighbors_json.c b/transtable_global_json.c similarity index 56% copy from neighbors_json.c copy to transtable_global_json.c index 6c9bdc3..9691401 100644 --- a/neighbors_json.c +++ b/transtable_global_json.c @@ -10,11 +10,11 @@ #include "genl_json.h" -static struct json_query_data batctl_json_query_neighbors = { +static struct json_query_data batctl_json_query_transtable_global = { .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_NEIGHBORS, + .cmd = BATADV_CMD_GET_TRANSTABLE_GLOBAL, }; -COMMAND_NAMED(JSON_MIF, neighbors_json, "nj", handle_json_query, +COMMAND_NAMED(JSON_MIF, transtable_global_json, "tgj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_neighbors, ""); + &batctl_json_query_transtable_global, "");

1 0

[batctl] master: batctl: Add hardifs_json command (86b57e4)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 86b57e4746d74285e406117097a78e00abc64639 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 16:23:03 2021 +0200 batctl: Add hardifs_json command Signed-off-by: Sven Eckelmann <sven(a)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"

1 0

[batctl] master: batctl: Reorder and clean up README (233f44e)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 233f44ee5fca8aa6f27c8aa8fefb00f8d604d103 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 15:37:01 2021 +0200 batctl: Reorder and clean up README The readme was completely unordered, contained wrong entries and was missing entries for some commands. Cleaning this up a little bit should make it easier for the new commands to find the correct place in this file. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 233f44ee5fca8aa6f27c8aa8fefb00f8d604d103 README.rst | 862 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 495 insertions(+), 367 deletions(-) diff --git a/README.rst b/README.rst index 9c55ad5..ab5fa84 100644 --- a/README.rst +++ b/README.rst @@ -16,7 +16,7 @@ settings. How does it work ? -================== +------------------ batctl uses the raw packet sockets to inject custom icmp packets into the data flow. That's why ping and traceroute work almost like their IP based @@ -26,7 +26,7 @@ recognize the packets. The bat-hosts file -================== +------------------ This file is similar to the /etc/hosts file. You can write one MAC address and one host name per line. batctl will analyze the file to find the matching MAC @@ -34,8 +34,55 @@ address to your provided host name. Host names are much easier to remember than MAC addresses. ;) +Commands +======== + + +batctl interface +---------------- + +display or modify the interface settings + +Usage:: + + batctl interface|if [add|del iface(s)] + +Example:: + + $ batctl interface + eth0: active + + +batctl ping +----------- + +Sends a Layer 2 batman-adv ping to check round trip time and connectivity + +Usage:: + + batctl ping [parameters] mac|bat-host|host-name|IP-address + parameters: + -c ping packet count + -h print this help + -i interval in seconds + -t timeout in seconds + -T don't try to translate mac to originator address + -R record route + +Example:: + + $ batctl ping fe:fe:00:00:09:01 + PING fe:fe:00:00:09:01 (fe:fe:00:00:09:01) 19(47) bytes of data + 19 bytes from fe:fe:00:00:09:01 icmp_seq=1 ttl=43 time=8.74 ms + 19 bytes from fe:fe:00:00:09:01 icmp_seq=2 ttl=43 time=7.48 ms + 19 bytes from fe:fe:00:00:09:01 icmp_seq=3 ttl=43 time=8.23 ms + ^C--- fe:fe:00:00:09:01 ping statistics --- + 3 packets transmitted, 3 received, 0% packet loss + rtt min/avg/max/mdev = 7.476/8.151/8.743/1.267 ms + + batctl statistics -================= +----------------- The batman-adv kernel module maintains a number of traffic counters which are exported to user space. With batctl these counters can be easily retrieved. The output may vary @@ -84,84 +131,8 @@ Example:: dat_reply_rx: 0 -batctl translate -================ - -Translates a destination (hostname, IPv4, IPv6, MAC, bat_host-name) to the -originator mac address responsible for it. - -Usage:: - - batctl translate mac|bat-host|host-name|IP-address - -Example:: - - $ batctl translate www.google.de - 02:ca:fe:af:fe:01 - $ batctl translate 02:ca:fe:af:fe:01 - 02:ca:fe:af:fe:01 - $ batctl translate 192.168.1.2 - 02:ca:fe:af:fe:05 - $ batctl translate fe:fe:00:00:09:01 - 02:ca:fe:af:fe:05 - $ batctl translate 2001::1 - 02:ca:fe:af:fe:05 - - -batctl ping -=========== - -Sends a Layer 2 batman-adv ping to check round trip time and connectivity - -Usage:: - - batctl ping [parameters] mac|bat-host|host-name|IP-address - parameters: - -c ping packet count - -h print this help - -i interval in seconds - -t timeout in seconds - -T don't try to translate mac to originator address - -R record route - -Example:: - - $ batctl ping fe:fe:00:00:09:01 - PING fe:fe:00:00:09:01 (fe:fe:00:00:09:01) 19(47) bytes of data - 19 bytes from fe:fe:00:00:09:01 icmp_seq=1 ttl=43 time=8.74 ms - 19 bytes from fe:fe:00:00:09:01 icmp_seq=2 ttl=43 time=7.48 ms - 19 bytes from fe:fe:00:00:09:01 icmp_seq=3 ttl=43 time=8.23 ms - ^C--- fe:fe:00:00:09:01 ping statistics --- - 3 packets transmitted, 3 received, 0% packet loss - rtt min/avg/max/mdev = 7.476/8.151/8.743/1.267 ms - - -batctl traceroute -================= - -Traceroute sends 3 packets to each hop, awaits the answers and prints out the -response times. - -Usage:: - - batctl traceroute [parameters] mac|bat-host|host-name|IP-address - -Example:: - - $ batctl traceroute fe:fe:00:00:09:01 - traceroute to fe:fe:00:00:09:01 (fe:fe:00:00:09:01), 50 hops max, 19 byte packets - 1: fe:fe:00:00:02:01 4.932 ms 2.338 ms 1.333 ms - 2: fe:fe:00:00:03:01 6.860 ms 1.579 ms 1.260 ms - 3: fe:fe:00:00:04:01 2.342 ms 1.547 ms 1.655 ms - 4: fe:fe:00:00:05:01 2.906 ms 2.211 ms 2.253 ms - 5: fe:fe:00:00:06:01 3.577 ms 2.687 ms 3.088 ms - 6: fe:fe:00:00:07:01 4.217 ms 5.741 ms 3.551 ms - 7: fe:fe:00:00:08:01 5.017 ms 5.547 ms 4.294 ms - 8: fe:fe:00:00:09:01 5.730 ms 4.970 ms 6.437 ms - - batctl tcpdump -============== +-------------- tcpdump layer 2 and/or layer 3 traffic on the given interface @@ -207,126 +178,217 @@ Example output for tcpdump:: 01:51:44.381064 BAT kansas: OGM via neigh kansas, seqno 6720, tq 255, ttl 50, v 9, flags [..I], length 28 -batctl bisect_iv -================ +batctl traceroute +----------------- -Analyzes the B.A.T.M.A.N. IV logfiles to build a small internal database of all sent sequence -numbers and routing table changes. This database can be used to search for routing loops -(default action), to trace OGMs of a host (use "-t" to specify the mac address or -bat-host name) throughout the network or to display routing tables of the nodes (use "-r" to -specify the mac address or bat-host name). You can name a specific sequence number or a range -using the "-s" option to limit the output's range. Furthermore you can filter the output by -specifying an originator (use "-o" to specify the mac address or bat-host name) to only see -data connected to this originator. If "-n" was given batctl will not replace the mac -addresses with bat-host names in the output. +Traceroute sends 3 packets to each hop, awaits the answers and prints out the +response times. Usage:: - batctl bisect_iv [parameters] <file1> <file2> .. <fileN> - parameters: + batctl traceroute [parameters] mac|bat-host|host-name|IP-address - -h print this help - -l run a loop detection of given mac address or bat-host (default) - -n don't convert addresses to bat-host names - -r print routing tables of given mac address or bat-host - -s seqno range to limit the output - -t trace seqnos of given mac address or bat-host +Example:: -Examples:: + $ batctl traceroute fe:fe:00:00:09:01 + traceroute to fe:fe:00:00:09:01 (fe:fe:00:00:09:01), 50 hops max, 19 byte packets + 1: fe:fe:00:00:02:01 4.932 ms 2.338 ms 1.333 ms + 2: fe:fe:00:00:03:01 6.860 ms 1.579 ms 1.260 ms + 3: fe:fe:00:00:04:01 2.342 ms 1.547 ms 1.655 ms + 4: fe:fe:00:00:05:01 2.906 ms 2.211 ms 2.253 ms + 5: fe:fe:00:00:06:01 3.577 ms 2.687 ms 3.088 ms + 6: fe:fe:00:00:07:01 4.217 ms 5.741 ms 3.551 ms + 7: fe:fe:00:00:08:01 5.017 ms 5.547 ms 4.294 ms + 8: fe:fe:00:00:09:01 5.730 ms 4.970 ms 6.437 ms - $ batctl bisect_iv log/* -l uml3 - Analyzing routing tables of originator: uml3 [all sequence numbers] - Checking host: uml3 - Path towards uml7 (seqno 9 via neigh uml5): -> uml5 -> uml6 - Path towards uml7 (seqno 10 via neigh uml4): -> uml4 -> uml5 -> uml6 - Path towards uml6 (seqno 4 via neigh uml4): -> uml4 - Path towards uml8 (seqno 12 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 - Path towards uml8 (seqno 203 via neigh uml4): -> uml4 -> uml6 -> uml7 - Path towards uml8 (seqno 391 via neigh uml2): -> uml2 -> uml3 -> uml2 aborted due to loop! - Path towards uml8 (seqno 396 via neigh uml4): -> uml4 -> uml6 -> uml7 - Path towards uml9 (seqno 10 via neigh uml5): -> uml5 -> uml6 -> uml7 -> uml9. - Path towards uml9 (seqno 10 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml9. - Path towards uml9 (seqno 11 via neigh uml4): -> uml4 -> uml6 -> uml7 -> uml8 -> uml9. - Path towards uml9 (seqno 12 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. - Path towards uml9 (seqno 21 via neigh uml5): -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. - Path towards uml9 (seqno 22 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. +batctl translate +---------------- - $ ./batctl bisect_iv -t uml3 log/* - Sequence number flow of originator: uml3 [all sequence numbers] - [...] - +=> uml3 (seqno 19) - |- uml2 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] - | |- uml3 [tq: 154, ttl: 49, neigh: uml2, prev_sender: uml3] - | \- uml1 [tq: 154, ttl: 49, neigh: uml2, prev_sender: uml3] - | |- uml3 [tq: 51, ttl: 48, neigh: uml1, prev_sender: uml2] - | \- uml2 [tq: 51, ttl: 48, neigh: uml1, prev_sender: uml2] - |- uml5 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] - | |- uml6 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] - | | |- uml5 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] - | | |- uml7 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] - | | | |- uml8 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] - | | | | |- uml6 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] - | | | | |- uml9 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] - | | | | \- uml7 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] - | | | |- uml6 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] - | | | |- uml9 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] - | | | \- uml5 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] - | | \- uml4 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] - | |- uml7 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] - | \- uml4 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] - \- uml4 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] - |- uml3 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] - |- uml6 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] - |- uml2 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] - \- uml5 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] - +=> uml3 (seqno 20) - |- uml2 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] - | |- uml3 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] - | |- uml1 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] - | \- uml4 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] - |- uml5 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] - | |- uml3 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] - | |- uml6 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] - | | |- uml8 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] - | | |- uml5 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] - | | |- uml7 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] - | | | |- uml8 [tq: 5, ttl: 46, neigh: uml7, prev_sender: uml6] - | | | | |- uml6 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] - | | | | |- uml9 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] - | | | | \- uml7 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] - | | | \- uml6 [tq: 5, ttl: 46, neigh: uml7, prev_sender: uml6] - | | \- uml4 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] - | \- uml4 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] - |- uml1 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] - | \- uml2 [tq: 49, ttl: 48, neigh: uml1, prev_sender: uml3] - \- uml4 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] - |- uml3 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] - |- uml6 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] - |- uml2 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] - \- uml5 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] - [...] +Translates a destination (hostname, IPv4, IPv6, MAC, bat_host-name) to the +originator mac address responsible for it. +Usage:: -batctl originators -================== + batctl translate mac|bat-host|host-name|IP-address -Check the Originators table +Example:: + + $ batctl translate www.google.de + 02:ca:fe:af:fe:01 + $ batctl translate 02:ca:fe:af:fe:01 + 02:ca:fe:af:fe:01 + $ batctl translate 192.168.1.2 + 02:ca:fe:af:fe:05 + $ batctl translate fe:fe:00:00:09:01 + 02:ca:fe:af:fe:05 + $ batctl translate 2001::1 + 02:ca:fe:af:fe:05 + + +Debug information tables +======================== + + +batctl backbonetable +-------------------- + +Check the bridge loop avoidance backbone table Usage:: - batctl originators|o + batctl backbonetable|bbt Example:: - $ batctl originators - [B.A.T.M.A.N. adv 2011.4.0, MainIF/MAC: eth0/fe:fe:00:00:01:01 (bat0)] - Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... - fe:fe:00:00:08:01 0.820s (194) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 65) fe:fe:00:00:02:01 (194) - fe:fe:00:00:03:01 0.980s (245) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 81) fe:fe:00:00:02:01 (245) - fe:fe:00:00:05:01 0.140s (221) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 76) fe:fe:00:00:02:01 (221) - fe:fe:00:00:04:01 0.010s (235) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (235) fe:fe:00:00:03:01 ( 81) - fe:fe:00:00:09:01 0.830s (187) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 63) fe:fe:00:00:02:01 (187) + Originator VID last seen (CRC ) + 4a:97:a4:b8:fc:17 on -1 1.376s (0x847a) + + +batctl claimtable +----------------- + +Check the bridge loop avoidance claim table table + +Usage:: + + batctl claimtable|cl + +Example:: + + Client VID Originator [o] (CRC ) + e4:95:6e:4f:06:28 on -1 by 02:ba:de:af:fe:01 [*] (0xbb73) + 08:ee:8b:84:82:8b on -1 by 02:ba:de:af:fe:01 [*] (0xbb73) + ac:86:74:9f:4d:80 on -1 by 02:ba:de:af:fe:01 [*] (0x3b7e) + 60:14:66:6f:ec:52 on -1 by 02:ba:de:af:fe:01 [*] (0xbb73) + 3a:ef:e8:e0:10:02 on -1 by 02:ba:de:af:fe:01 [*] (0xbb73) + 56:bd:b4:a7:0b:aa on -1 by 02:ba:de:af:fe:01 [*] (0xbb73) + 42:3a:6e:68:01:7d on -1 by 02:ba:de:af:fe:01 [*] (0xbb73) + 0c:d7:46:2c:41:39 on -1 by 02:ba:de:af:fe:01 [*] (0xbb73) + + +batctl dat_cache +---------------- + +display the local D.A.T. cache + +Usage:: + + batctl dat_cache|dc + +Example:: + + Distributed ARP Table (bat0): + IPv4 MAC last-seen + * 172.100.0.1 b6:9b:d0:ea:b1:13 0:00 + +where + +IPv4: + is the IP address of a client in the mesh network +MAC: + is the MAC address associated to that IP +last-seen: + is the amount of time since last refresh of this entry + + +batctl gateways +--------------- + +Check the detected (and maybe selected) gateways + +Usage:: + + batctl gateways|gwl + +Example:: + + Router ( TQ) Next Hop [outgoingIf] Bandwidth + 02:62:e7:ab:01:01 (180) ae:1b:bf:52:25:58 [ enp0s1]: 10.0/2.0 MBit + 02:62:e7:ab:05:01 (180) ae:1b:bf:52:25:58 [ enp0s1]: 10.0/2.0 MBit + 02:62:e7:ab:06:01 (235) ae:1b:bf:52:25:58 [ enp0s1]: 10.0/2.0 MBit + 02:62:e7:ab:02:01 (176) ae:1b:bf:52:25:58 [ enp0s1]: 10.0/2.0 MBit + 02:62:e7:ab:03:01 (180) ae:1b:bf:52:25:58 [ enp0s1]: 10.0/2.0 MBit + 02:62:e7:ab:04:01 (180) ae:1b:bf:52:25:58 [ enp0s1]: 10.0/2.0 MBit + + +batctl mcast_flags +------------------ + +display local and remote multicast flags + +Usage:: + + batctl mcast_flags|mf + +Example:: + + Multicast flags (own flags: [U46]) + * Bridged [U] U + * No IGMP/MLD Querier [4/6]: ./. + * Shadowing IGMP/MLD Querier [4/6]: 4/6 + ------------------------------------------- + Originator Flags + 02:04:64:a4:39:c1 [U..] + 02:04:64:a4:39:c2 [U..] + 02:04:64:a4:39:c3 [...] + +where + +Originator: + the MAC address of the originating (primary interface) batman-adv node +Flags: + multicast flags of the according node +U: + wants all unsnoopable multicast traffic, meaning other nodes need to always + forward any multicast traffic destined to ff02::1 or 224.0.0.0/24 to it +4: + wants all IPv4 multicast traffic, meaning other nodes need to always forward + any IPv4 multicast traffic to it +6: + wants all IPv6 multicast traffic, meaning other nodes need to always forward + any IPv6 multicast traffic to it + +If a node does not have multicast optimizations available (e.g. old batman-adv +version or optimizations not compiled in), therefore not announcing any +multicast tvlv/flags, a '-' will be displayed instead of '[...]'. + + +batctl neighbors +---------------- + +Check the neighbors table + +Usage:: + + batctl neighbors|n + +Example:: + + IF Neighbor last-seen + enp0s1 16:7b:3c:c2:bf:b8 4.612s + enp0s1 ae:1b:bf:52:25:58 0.740s + + +batctl originators +------------------ + +Check the Originators table + +Usage:: + + batctl originators|o + +Example:: + + $ batctl originators + [B.A.T.M.A.N. adv 2011.4.0, MainIF/MAC: eth0/fe:fe:00:00:01:01 (bat0)] + Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... + fe:fe:00:00:08:01 0.820s (194) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 65) fe:fe:00:00:02:01 (194) + fe:fe:00:00:03:01 0.980s (245) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 81) fe:fe:00:00:02:01 (245) + fe:fe:00:00:05:01 0.140s (221) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 76) fe:fe:00:00:02:01 (221) + fe:fe:00:00:04:01 0.010s (235) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (235) fe:fe:00:00:03:01 ( 81) + fe:fe:00:00:09:01 0.830s (187) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 63) fe:fe:00:00:02:01 (187) fe:fe:00:00:06:01 0.830s (213) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 71) fe:fe:00:00:02:01 (213) fe:fe:00:00:02:01 0.240s (255) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 81) fe:fe:00:00:02:01 (255) fe:fe:00:00:07:01 0.670s (200) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 68) fe:fe:00:00:02:01 (200) @@ -356,203 +418,169 @@ Example:: fe:f0:00:00:01:01 0.510s (255) fe:f0:00:00:01:01 [ eth0]: fe:f1:00:00:01:01 (240) fe:f0:00:00:01:01 (255) -batctl interface -================ -display or modify the interface settings +batctl translocal +----------------- + +display the local translation table Usage:: - batctl interface|if [add|del iface(s)] + batctl translocal|tl Example:: - $ batctl interface - eth0: active - - -batctl interval -=============== - -display or modify the originator interval in ms - -Usage:: + $ batctl translocal + Locally retrieved addresses (from bat0) announced via TT (TTVN: 1): + * fe:fe:00:00:01:01 [RPNXW] - batctl orig_interval|it [interval] +In particular, RPNXW are flags which have the following meanings: -Example:: +R/Roaming: + this client moved to another node but it is still kept for consistency reasons + until the next OGM is sent. +P/noPurge: + this client represents the local soft interface and will never be deleted. +N/New: + this client has recently been added but is not advertised in the mesh until + the next OGM is sent (for consistency reasons). +X/delete: + this client has to be removed for some reason, but it is still kept for + consistency reasons until the next OGM is sent. +W/Wireless: + this client is connected to the node through a wireless device. - $ batctl interval - 1000 +If any of the flags is not enabled, a '.' will substitute its symbol. -batctl elp interval -=================== +batctl transglobal +------------------ -display or modify the elp interval in ms for hard interface +display the global translation table Usage:: - batctl hardif $hardif elp_interval|et [interval] + batctl transglobal|tg Example:: - $ batctl hardif eth0 elp_interval 200 - $ batctl hardif eth0 elp_interval - 200 - - -batctl throughput override -========================== + Globally announced TT entries received via the mesh bat0 + Client (TTVN) Originator (Curr TTVN) Flags + * fe:fe:00:00:01:01 ( 12) via fe:fe:00:00:01:02 ( 50) [RXW] -display or modify the throughput override in kbit/s for hard interface +where -Usage:: +TTVN: + is the translation-table-version-number which introduced this client +Curr TTVN: + is the translation-table-version-number currently advertised by the + originator serving this client (different clients advertised by the same + originator have the same Curr TTVN) +Flags that mean: + R/Roaming: + this client moved to another node but it is still kept for consistency + reasons until the next OGM is sent. + X/delete: + this client has to be removed for some reason, but it is still kept for + consistency reasons until the next OGM is sent. + W/Wireless: + this client is connected to the node through a wireless device. - batctl hardif $hardif throughput_override|to [kbit] +If any of the flags is not enabled, a '.' will substitute its symbol. -Example:: - $ batctl hardif eth0 throughput_override 15000 - $ batctl hardif eth0 throughput_override 15mbit - $ batctl hardif eth0 throughput_override - 15.0 MBit +Settings +======== -batctl loglevel -=============== +batctl aggregation +------------------ -display or modify the log level +display or modify the packet aggregation setting Usage:: - batctl loglevel|ll [level] - -Example:: - - $ batctl loglevel - [x] all debug output disabled (none) - [ ] messages related to routing / flooding / broadcasting (batman) - [ ] messages related to route added / changed / deleted (routes) - [ ] messages related to translation table operations (tt) - [ ] messages related to bridge loop avoidance (bla) - [ ] messages related to arp snooping and distributed arp table (dat) - [ ] messages related to network coding (nc) - [ ] messages related to multicast (mcast) - [ ] messages related to throughput meter (tp) + batctl aggregation|ag [0|1] -batctl nc_nodes -=============== +ap_isolation +------------ -display the neighbor nodes considered for network coded packets +display or modify the client isolation setting Usage:: - batctl nc_nodes|nn - -Example:: + batctl ap_isolation|ap [0|1] - Node: fe:fe:00:0a:01:01 - Ingoing: fe:fe:00:0a:01:01 fe:fe:00:0a:02:01 - Outgoing: fe:fe:00:0a:01:01 fe:fe:00:0a:02:01 -Where +bonding +------- -Node: - is the neighbor -Ingoing: - is the neighbors this neighbor can hear packets from -Outgoing: - is the neighbors that can hear packets from this neighbor - - -batctl network_coding -===================== - -display or modify the network coding setting +display or modify the bonding setting Usage:: - batctl network_coding|nc [0|1] + batctl bonding|b [0|1] -Note that network coding requires a working promiscuous mode on all interfaces. +bridge_loop_avoidance +--------------------- -batctl multicast_forceflood -=========================== - -display or modify the multicast forceflood setting +display or modify the bridge_loop_avoidance setting Usage:: - batctl multicast_forceflood|mff [0|1] + batctl bridge_loop_avoidance|bl [0|1] -batctl multicast_fanout -======================= +distributed_arp_table +--------------------- -display or modify the multicast fanout setting +display or modify the distributed_arp_table setting Usage:: - batctl multicast_fanout|mo [fanout] + batctl distributed_arp_table|dat [0|1] -batctl mcast_flags -================== +batctl elp interval +------------------- -display local and remote multicast flags +display or modify the elp interval in ms for hard interface Usage:: - batctl mcast_flags|mf + batctl hardif $hardif elp_interval|et [interval] Example:: - Multicast flags (own flags: [U46]) - * Bridged [U] U - * No IGMP/MLD Querier [4/6]: ./. - * Shadowing IGMP/MLD Querier [4/6]: 4/6 - ------------------------------------------- - Originator Flags - 02:04:64:a4:39:c1 [U..] - 02:04:64:a4:39:c2 [U..] - 02:04:64:a4:39:c3 [...] + $ batctl hardif eth0 elp_interval 200 + $ batctl hardif eth0 elp_interval + 200 -where -Originator: - the MAC address of the originating (primary interface) batman-adv node -Flags: - multicast flags of the according node -U: - wants all unsnoopable multicast traffic, meaning other nodes need to always - forward any multicast traffic destined to ff02::1 or 224.0.0.0/24 to it -4: - wants all IPv4 multicast traffic, meaning other nodes need to always forward - any IPv4 multicast traffic to it -6: - wants all IPv6 multicast traffic, meaning other nodes need to always forward - any IPv6 multicast traffic to it +fragmentation +------------- -If a node does not have multicast optimizations available (e.g. old batman-adv -version or optimizations not compiled in), therefore not announcing any -multicast tvlv/flags, a '-' will be displayed instead of '[...]'. +display or modify the fragmentation setting +Usage:: -batctl aggregation -================== + batctl fragmentation|f [0|1] -display or modify the packet aggregation setting + +gw_mode +------- + +display or modify the gw_mode setting Usage:: - batctl aggregation|ag [0|1] + batctl gw_mode|gw [0|1] batctl hop_penalty -================== +------------------ display or modify the hop_penalty (0-255) @@ -572,7 +600,7 @@ Example:: batctl isolation_mark -===================== +--------------------- display or modify the isolation mark. This value is used by Extended Isolation feature. @@ -587,103 +615,203 @@ Usage:: * Example 4: ``batctl mark 0x0f`` -batctl translocal -================= +batctl loglevel +--------------- -display the local translation table +display or modify the log level Usage:: - batctl translocal|tl + batctl loglevel|ll [level] Example:: - $ batctl translocal - Locally retrieved addresses (from bat0) announced via TT (TTVN: 1): - * fe:fe:00:00:01:01 [RPNXW] + $ batctl loglevel + [x] all debug output disabled (none) + [ ] messages related to routing / flooding / broadcasting (batman) + [ ] messages related to route added / changed / deleted (routes) + [ ] messages related to translation table operations (tt) + [ ] messages related to bridge loop avoidance (bla) + [ ] messages related to arp snooping and distributed arp table (dat) + [ ] messages related to network coding (nc) + [ ] messages related to multicast (mcast) + [ ] messages related to throughput meter (tp) -In particular, RPNXW are flags which have the following meanings: -R/Roaming: - this client moved to another node but it is still kept for consistency reasons - until the next OGM is sent. -P/noPurge: - this client represents the local soft interface and will never be deleted. -N/New: - this client has recently been added but is not advertised in the mesh until - the next OGM is sent (for consistency reasons). -X/delete: - this client has to be removed for some reason, but it is still kept for - consistency reasons until the next OGM is sent. -W/Wireless: - this client is connected to the node through a wireless device. +batctl multicast_fanout +----------------------- -If any of the flags is not enabled, a '.' will substitute its symbol. +display or modify the multicast fanout setting +Usage:: -batctl transglobal -================== + batctl multicast_fanout|mo [fanout] -display the global translation table + +batctl multicast_forceflood +--------------------------- + +display or modify the multicast forceflood setting Usage:: - batctl transglobal|tg + batctl multicast_forceflood|mff [0|1] -Example:: - Globally announced TT entries received via the mesh bat0 - Client (TTVN) Originator (Curr TTVN) Flags - * fe:fe:00:00:01:01 ( 12) via fe:fe:00:00:01:02 ( 50) [RXW] +batctl network_coding +--------------------- -where +display or modify the network coding setting -TTVN: - is the translation-table-version-number which introduced this client -Curr TTVN: - is the translation-table-version-number currently advertised by the - originator serving this client (different clients advertised by the same - originator have the same Curr TTVN) -Flags that mean: - R/Roaming: - this client moved to another node but it is still kept for consistency - reasons until the next OGM is sent. - X/delete: - this client has to be removed for some reason, but it is still kept for - consistency reasons until the next OGM is sent. - W/Wireless: - this client is connected to the node through a wireless device. +Usage:: -If any of the flags is not enabled, a '.' will substitute its symbol. + batctl network_coding|nc [0|1] +Note that network coding requires a working promiscuous mode on all interfaces. -batctl dat_cache -================= -display the local D.A.T. cache +batctl orig_interval +-------------------- + +display or modify the originator interval in ms Usage:: - batctl dat_cache|dc + batctl orig_interval|it [interval] Example:: - Distributed ARP Table (bat0): - IPv4 MAC last-seen - * 172.100.0.1 b6:9b:d0:ea:b1:13 0:00 + $ batctl interval + 1000 -where -IPv4: - is the IP address of a client in the mesh network -MAC: - is the MAC address associated to that IP -last-seen: - is the amount of time since last refresh of this entry +batctl throughput override +-------------------------- + +display or modify the throughput override in kbit/s for hard interface + +Usage:: + + batctl hardif $hardif throughput_override|to [kbit] + +Example:: + + $ batctl hardif eth0 throughput_override 15000 + $ batctl hardif eth0 throughput_override 15mbit + $ batctl hardif eth0 throughput_override + 15.0 MBit + + +Advanced Analytics +================== + +batctl bisect_iv +---------------- + +Analyzes the B.A.T.M.A.N. IV logfiles to build a small internal database of all sent sequence +numbers and routing table changes. This database can be used to search for routing loops +(default action), to trace OGMs of a host (use "-t" to specify the mac address or +bat-host name) throughout the network or to display routing tables of the nodes (use "-r" to +specify the mac address or bat-host name). You can name a specific sequence number or a range +using the "-s" option to limit the output's range. Furthermore you can filter the output by +specifying an originator (use "-o" to specify the mac address or bat-host name) to only see +data connected to this originator. If "-n" was given batctl will not replace the mac +addresses with bat-host names in the output. + +Usage:: + + batctl bisect_iv [parameters] <file1> <file2> .. <fileN> + parameters: + + -h print this help + -l run a loop detection of given mac address or bat-host (default) + -n don't convert addresses to bat-host names + -r print routing tables of given mac address or bat-host + -s seqno range to limit the output + -t trace seqnos of given mac address or bat-host + +Examples:: + + $ batctl bisect_iv log/* -l uml3 + Analyzing routing tables of originator: uml3 [all sequence numbers] + + Checking host: uml3 + Path towards uml7 (seqno 9 via neigh uml5): -> uml5 -> uml6 + Path towards uml7 (seqno 10 via neigh uml4): -> uml4 -> uml5 -> uml6 + Path towards uml6 (seqno 4 via neigh uml4): -> uml4 + Path towards uml8 (seqno 12 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 + Path towards uml8 (seqno 203 via neigh uml4): -> uml4 -> uml6 -> uml7 + Path towards uml8 (seqno 391 via neigh uml2): -> uml2 -> uml3 -> uml2 aborted due to loop! + Path towards uml8 (seqno 396 via neigh uml4): -> uml4 -> uml6 -> uml7 + Path towards uml9 (seqno 10 via neigh uml5): -> uml5 -> uml6 -> uml7 -> uml9. + Path towards uml9 (seqno 10 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml9. + Path towards uml9 (seqno 11 via neigh uml4): -> uml4 -> uml6 -> uml7 -> uml8 -> uml9. + Path towards uml9 (seqno 12 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. + Path towards uml9 (seqno 21 via neigh uml5): -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. + Path towards uml9 (seqno 22 via neigh uml4): -> uml4 -> uml5 -> uml6 -> uml7 -> uml8 -> uml9. + + $ ./batctl bisect_iv -t uml3 log/* + Sequence number flow of originator: uml3 [all sequence numbers] + [...] + +=> uml3 (seqno 19) + |- uml2 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + | |- uml3 [tq: 154, ttl: 49, neigh: uml2, prev_sender: uml3] + | \- uml1 [tq: 154, ttl: 49, neigh: uml2, prev_sender: uml3] + | |- uml3 [tq: 51, ttl: 48, neigh: uml1, prev_sender: uml2] + | \- uml2 [tq: 51, ttl: 48, neigh: uml1, prev_sender: uml2] + |- uml5 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + | |- uml6 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] + | | |- uml5 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] + | | |- uml7 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] + | | | |- uml8 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] + | | | | |- uml6 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] + | | | | |- uml9 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] + | | | | \- uml7 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] + | | | |- uml6 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] + | | | |- uml9 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] + | | | \- uml5 [tq: 3, ttl: 46, neigh: uml7, prev_sender: uml6] + | | \- uml4 [tq: 11, ttl: 47, neigh: uml6, prev_sender: uml5] + | |- uml7 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] + | \- uml4 [tq: 33, ttl: 48, neigh: uml5, prev_sender: uml3] + \- uml4 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + |- uml3 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml6 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml2 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] + \- uml5 [tq: 106, ttl: 49, neigh: uml4, prev_sender: uml3] + +=> uml3 (seqno 20) + |- uml2 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + | |- uml3 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] + | |- uml1 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] + | \- uml4 [tq: 160, ttl: 49, neigh: uml2, prev_sender: uml3] + |- uml5 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + | |- uml3 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] + | |- uml6 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] + | | |- uml8 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] + | | |- uml5 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] + | | |- uml7 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] + | | | |- uml8 [tq: 5, ttl: 46, neigh: uml7, prev_sender: uml6] + | | | | |- uml6 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] + | | | | |- uml9 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] + | | | | \- uml7 [tq: 0, ttl: 45, neigh: uml8, prev_sender: uml7] + | | | \- uml6 [tq: 5, ttl: 46, neigh: uml7, prev_sender: uml6] + | | \- uml4 [tq: 16, ttl: 47, neigh: uml6, prev_sender: uml5] + | \- uml4 [tq: 43, ttl: 48, neigh: uml5, prev_sender: uml3] + |- uml1 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + | \- uml2 [tq: 49, ttl: 48, neigh: uml1, prev_sender: uml3] + \- uml4 [tq: 255, ttl: 50, neigh: uml3, prev_sender: uml3] + |- uml3 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml6 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] + |- uml2 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] + \- uml5 [tq: 114, ttl: 49, neigh: uml4, prev_sender: uml3] + [...] + + +Appendix +======== batctl and network name spaces -============================== +------------------------------ The batman-adv kernel module is netns aware. Mesh instances can be created in name spaces, and interfaces in that name space added to the

1 0

[batctl] master: batctl: netlink: Allow to use netlink_query_common hardif/vlan (6ce86b6)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 6ce86b601a13885f98d226e20b33a4be312c991b Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 17:15:59 2021 +0200 batctl: netlink: Allow to use netlink_query_common hardif/vlan The netlink_query_common didn't allow to set attributes for hardif/vlan specific queries. Using a similar approach as sys_simple_nlquery makes it possible to implement such a feature with a simple callback function. And might allow later to use netlink_query_common inside sys_simple_nlquery. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6ce86b601a13885f98d226e20b33a4be312c991b netlink.c | 22 ++++++++++++++++------ netlink.h | 6 ++++-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/netlink.c b/netlink.c index 33cfa4c..e92fa80 100644 --- a/netlink.c +++ b/netlink.c @@ -622,8 +622,9 @@ static int nlquery_stop_cb(struct nl_msg *msg, void *arg) int netlink_query_common(struct state *state, unsigned int mesh_ifindex, uint8_t nl_cmd, - nl_recvmsg_msg_cb_t callback, int flags, - struct nlquery_opts *query_opts) + nl_recvmsg_msg_cb_t callback, + nl_recvmsg_msg_cb_t attribute_cb, + int flags, struct nlquery_opts *query_opts) { struct nl_msg *msg; struct nl_cb *cb; @@ -649,6 +650,15 @@ int netlink_query_common(struct state *state, flags, nl_cmd, 1); nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, mesh_ifindex); + + if (attribute_cb) { + ret = attribute_cb(msg, state); + if (ret < 0) { + nlmsg_free(msg); + goto err_free_cb; + } + } + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); @@ -739,7 +749,7 @@ int translate_mac_netlink(struct state *state, const struct ether_addr *mac, ret = netlink_query_common(state, state->mesh_ifindex, BATADV_CMD_GET_TRANSTABLE_GLOBAL, - translate_mac_netlink_cb, NLM_F_DUMP, + translate_mac_netlink_cb, NULL, NLM_F_DUMP, &opts.query_opts); if (ret < 0) return ret; @@ -845,7 +855,7 @@ int get_nexthop_netlink(struct state *state, const struct ether_addr *mac, ret = netlink_query_common(state, state->mesh_ifindex, BATADV_CMD_GET_ORIGINATORS, - get_nexthop_netlink_cb, NLM_F_DUMP, + get_nexthop_netlink_cb, NULL, NLM_F_DUMP, &opts.query_opts); if (ret < 0) return ret; @@ -921,7 +931,7 @@ int get_primarymac_netlink(struct state *state, uint8_t *primarymac) ret = netlink_query_common(state, state->mesh_ifindex, BATADV_CMD_GET_MESH_INFO, - get_primarymac_netlink_cb, 0, + get_primarymac_netlink_cb, NULL, 0, &opts.query_opts); if (ret < 0) return ret; @@ -997,7 +1007,7 @@ int get_algoname_netlink(struct state *state, unsigned int mesh_ifindex, int ret; ret = netlink_query_common(state, mesh_ifindex, BATADV_CMD_GET_MESH, - get_algoname_netlink_cb, 0, + get_algoname_netlink_cb, NULL, 0, &opts.query_opts); if (ret < 0) return ret; diff --git a/netlink.h b/netlink.h index 20fb39b..237f760 100644 --- a/netlink.h +++ b/netlink.h @@ -58,8 +58,10 @@ int netlink_print_error(struct sockaddr_nl *nla, struct nlmsgerr *nlerr, void *arg); void netlink_print_remaining_header(struct print_opts *opts); -int netlink_query_common(struct state *state, unsigned int mesh_ifindex, - uint8_t nl_cmd, nl_recvmsg_msg_cb_t callback, +int netlink_query_common(struct state *state, + unsigned int mesh_ifindex, uint8_t nl_cmd, + nl_recvmsg_msg_cb_t callback, + nl_recvmsg_msg_cb_t attribute_cb, int flags, struct nlquery_opts *query_opts); extern char algo_name_buf[256];

1 0

[batctl] master: batctl: Add mcast_flags_json command (8d6165c)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 8d6165cc0cf8956ece6deabb96741e9342000509 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 16:23:03 2021 +0200 batctl: Add mcast_flags_json command Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 8d6165cc0cf8956ece6deabb96741e9342000509 Makefile | 1 + README.rst | 71 ++++++++++++++++++++++++++++++++++++++++++++ man/batctl.8 | 3 ++ hardif_json.c => mesh_json.c | 8 ++--- 4 files changed, 79 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a091920..478e767 100755 --- a/Makefile +++ b/Makefile @@ -62,6 +62,7 @@ $(eval $(call add_command,isolation_mark,y)) $(eval $(call add_command,loglevel,y)) $(eval $(call add_command,mcast_flags,y)) $(eval $(call add_command,mcast_flags_json,y)) +$(eval $(call add_command,mesh_json,y)) $(eval $(call add_command,multicast_fanout,y)) $(eval $(call add_command,multicast_forceflood,y)) $(eval $(call add_command,multicast_mode,y)) diff --git a/README.rst b/README.rst index d1faa9e..674c574 100644 --- a/README.rst +++ b/README.rst @@ -967,6 +967,77 @@ Example:: ] +batctl mesh_json +---------------- + +Get the current configuration of the batman-adv mesh interface and its global +state. + +The ``hard_ifindex``/``hard_ifname`` only refers to the primary interface. +More interfaces might be attached to theis interface. They can for +example be queried using:: + + ip -json link show master bat0 + +It also doesn't show all batman-adv interfaces on the system. Such +information must be queried using:: + + ip -json link show type batadv + + +Usage:: + + batctl meshif <netdev> mesh_json|mj + +Example:: + + $ batctl meshif bat0 mesh_json | json_pp + { + "aggregated_ogms_enabled": true, + "algo_name": "BATMAN_IV", + "ap_isolation_enabled": false, + "bla_crc": 44249, + "bonding_enabled": false, + "bridge_loop_avoidance_enabled": true, + "distributed_arp_table_enabled": true, + "fragmentation_enabled": true, + "gw_bandwidth_down": 100, + "gw_bandwidth_up": 20, + "gw_mode": "client", + "gw_sel_class": 20, + "hard_address": "02:ba:de:af:fe:01", + "hard_ifindex": 3, + "hard_ifname": "enp0s1", + "hop_penalty": 30, + "isolation_mark": 0, + "isolation_mask": 0, + "mcast_flags": { + "all_unsnoopables": false, + "raw": 24, + "want_all_ipv4": false, + "want_all_ipv6": false, + "want_no_rtr_ipv4": true, + "want_no_rtr_ipv6": true + }, + "mcast_flags_priv": { + "bridged": false, + "querier_ipv4_exists": false, + "querier_ipv4_shadowing": false, + "querier_ipv6_exists": false, + "querier_ipv6_shadowing": false, + "raw": 0 + }, + "mesh_address": "3e:dc:94:68:80:e8", + "mesh_ifindex": 9, + "mesh_ifname": "bat0", + "multicast_fanout": 16, + "multicast_forceflood_enabled": false, + "orig_interval": 5000, + "tt_ttvn": 2, + "version": "2021.0-15-gc84e5217" + } + + Advanced Analytics ================== diff --git a/man/batctl.8 b/man/batctl.8 index 9f28b3e..915bde0 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -326,6 +326,9 @@ List of available JSON queries: .RS 10 \- mcast_flags_json|mfj .RE +.RS 10 +\- mesh_json|mj +.RE .RE .br .IP "[\fBmeshif <netdev>\fP] \fBtranslate\fP|\fBt\fP \fBMAC_address\fP|\fBbat\-host_name\fP|\fBhost_name\fP|\fBIP_address\fP" diff --git a/hardif_json.c b/mesh_json.c similarity index 60% copy from hardif_json.c copy to mesh_json.c index 61fdc2f..47bba11 100644 --- a/hardif_json.c +++ b/mesh_json.c @@ -10,11 +10,11 @@ #include "genl_json.h" -static struct json_query_data batctl_json_query_hardif = { +static struct json_query_data batctl_json_query_mesh = { .nlm_flags = 0, - .cmd = BATADV_CMD_GET_HARDIF, + .cmd = BATADV_CMD_GET_MESH, }; -COMMAND_NAMED(JSON_HIF, hardif_json, "hj", handle_json_query, +COMMAND_NAMED(JSON_MIF, mesh_json, "mj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_hardif, ""); + &batctl_json_query_mesh, "");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits