commits

commits@lists.open-mesh.org

1 participants
12399 discussions

[batman-adv] master: batman-adv: Update CHANGELOG for upcoming release (5035cb7e)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 5035cb7e739562bc217f24d3fbd305b6cbfeccba Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:51:00 2021 +0200 batman-adv: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 5035cb7e739562bc217f24d3fbd305b6cbfeccba CHANGELOG.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6cc5cdcf..c3592b1c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,14 @@ .. SPDX-License-Identifier: GPL-2.0 +2021.1 (2021-05-18) +=================== + +* support latest kernels (4.4 - 5.13) +* coding style cleanups and refactoring +* bugs squashed: + + - correctly initialize padding when sending out translation table TVLVs + 2021.0 (2021-01-28) ===================

1 0

[batman-adv] master: batman-adv: Start new development cycle (1e54cd59)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 1e54cd591674c2c9849242b66a26fcd67af85521 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:53:59 2021 +0200 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 1e54cd591674c2c9849242b66a26fcd67af85521 net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 8f0102b7..b8f819a5 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2021.1" +#define BATADV_SOURCE_VERSION "2021.2" #endif /* B.A.T.M.A.N. parameters */

1 0

[batman-adv] master: batman-adv: Update compatible kernel version number (86dcfcfe)
by postmaster＠open-mesh.org 18 May '21

18 May '21

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit 86dcfcfe7d14e3383098a0041e3bda12767870e7 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue May 18 16:53:48 2021 +0200 batman-adv: Update compatible kernel version number Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 86dcfcfe7d14e3383098a0041e3bda12767870e7 README.external.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.external.rst b/README.external.rst index 13a892ad..4dcb7809 100644 --- a/README.external.rst +++ b/README.external.rst @@ -12,7 +12,7 @@ and as an external module. The external module allows to get new features without upgrading to a newer kernel version and to get batman-adv specific bug fixes for kernels that are not supported anymore. It compiles against and should work -with Linux 4.4 - 5.11. Supporting older versions is not +with Linux 4.4 - 5.13. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-)

1 0

[linux-merge]linux integration; annotated tag, v5.13-rc2, created. v5.13-rc2
by postmaster＠open-mesh.org 17 May '21

17 May '21

The annotated tag, v5.13-rc2 has been created at ce6471a4dff253eab89bd4eb3a84eef6bdba1f44 (tag) tagging d07f6ca923ea0927a1024dfccafc5b53b61cfecc (commit) replaces v5.13-rc1 tagged by Linus Torvalds on Sun May 16 15:27:44 2021 -0700 - Shortlog ------------------------------------------------------------ Linux 5.13-rc2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmChnGAeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGBS0IAJKCWwkob9JbkWOI rWSOSi5K9RKGhNHvMh9q7iPL69k/dpa8dxYMBqybD1Gm4WTCdD4sImAXgCjJmL13 DDddNSFRxafhgD06qx2otYJrCzqIB6QJUij9/GdD4KpRgpsKf/7aYrmJB8WlPxjC nw0gfkpHThbJ8LhfUaoUSZqzX8GWvmoemdy+8Ihff5vGWIs+MREcGTtEds2hwiVG qnaGrD8q3FEwpqlygX5aSgDhc2IlqHf7240CKpYRMVEOJG67vjioOzEUG5ZGU0Ng FnExscjc6Jn+uuoVZp++ATx8GACYEx87MWaHNJ5e3abpRG0Za3HUbYEtg55AMTPK 3v/j9KE= =4Jt+ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: batctl: Drop additional '{' in JSON for loglevel (1028b5e)
by postmaster＠open-mesh.org 17 May '21

17 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 1028b5e2b52c1861eff619c0dcb989606b3ba8e9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 17 10:15:20 2021 +0200 batctl: Drop additional '{' in JSON for loglevel Fixes: 57cc3c472a7d ("batctl: Introduce handler for JSON_* command types") Reported-by: Alexander Sarmanow <asarmanow(a)gmail.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 1028b5e2b52c1861eff619c0dcb989606b3ba8e9 genl_json.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/genl_json.c b/genl_json.c index 460838b..2be533d 100644 --- a/genl_json.c +++ b/genl_json.c @@ -204,8 +204,6 @@ static void nljson_print_loglevel(struct nlattr *attrs[], int idx) { uint32_t val = nla_get_u32(attrs[idx]); - putchar('{'); - putchar('{'); printf("\"batman\": %s,", val & BIT(0) ? "true" : "false");

1 0

[alfred] master: alfred: Document force mode in usage output (42753f4)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/alfred On branch : master >--------------------------------------------------------------- commit 42753f40a3e8f8c17e7927190be57bdb728dae0f Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 19:03:57 2021 +0200 alfred: Document force mode in usage output Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 42753f40a3e8f8c17e7927190be57bdb728dae0f main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/main.c b/main.c index e190d42..ad317cf 100644 --- a/main.c +++ b/main.c @@ -40,6 +40,7 @@ static void alfred_usage(void) printf("\n"); printf("server mode options:\n"); printf(" -i, --interface specify the interface (or comma separated list of interfaces) to listen on\n"); + printf(" -f, --force start server even when batman-adv or interface(s) are not yet available.\n"); printf(" -b specify the batman-adv interface\n"); printf(" configured on the system (default: bat0)\n"); printf(" use 'none' to disable the batman-adv\n");

1 0

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

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 3c5bf8901a3e89876a68644ae08396fd80580844 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 16:23:03 2021 +0200 batctl: Add bla_backbone_json command Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3c5bf8901a3e89876a68644ae08396fd80580844 Makefile | 1 + README.rst | 31 +++++++++++++++++++++++++++++++ bla_backbone_json.c | 20 ++++++++++++++++++++ man/batctl.8 | 3 +++ 4 files changed, 55 insertions(+) diff --git a/Makefile b/Makefile index cee4f0c..944e985 100755 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ $(eval $(call add_command,aggregation,y)) $(eval $(call add_command,ap_isolation,y)) $(eval $(call add_command,backbonetable,y)) $(eval $(call add_command,bisect_iv,$(CONFIG_BATCTL_BISECT))) +$(eval $(call add_command,bla_backbone_json,y)) $(eval $(call add_command,bonding,y)) $(eval $(call add_command,bridge_loop_avoidance,y)) $(eval $(call add_command,claimtable,y)) diff --git a/README.rst b/README.rst index 3d191f5..cd708c3 100644 --- a/README.rst +++ b/README.rst @@ -706,6 +706,37 @@ JSON netlink query helper ========================= +batctl bla_backbone_json +------------------------ + +Query batman-adv for the entries in the known backbones table of +bridge loop avoidance. + +Usage:: + + batctl meshif <netdev> bla_backbone_json|bbj + +Example:: + + $ batctl meshif bat0 bla_backbone_json | json_pp + [ + { + "bla_backbone": "02:ba:de:af:fe:01", + "bla_crc": 0, + "bla_own": true, + "bla_vid": -1, + "last_seen_msecs": 920 + }, + { + "bla_backbone": "02:ba:de:af:fe:01", + "bla_crc": 33755, + "bla_own": true, + "bla_vid": -1, + "last_seen_msecs": 44 + } + ] + + Advanced Analytics ================== diff --git a/bla_backbone_json.c b/bla_backbone_json.c new file mode 100644 index 0000000..5d50a9b --- /dev/null +++ b/bla_backbone_json.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) B.A.T.M.A.N. contributors: + * + * Sven Eckelmann <sven(a)narfation.org + * + * License-Filename: LICENSES/preferred/GPL-2.0 + */ + +#include "main.h" + +#include "genl_json.h" + +static struct json_query_data batctl_json_query_bla_backbone = { + .nlm_flags = NLM_F_DUMP, + .cmd = BATADV_CMD_GET_BLA_BACKBONE, +}; + +COMMAND_NAMED(JSON_MIF, bla_backbone_json, "bbj", handle_json_query, + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, + &batctl_json_query_bla_backbone, ""); diff --git a/man/batctl.8 b/man/batctl.8 index ce78fca..b4fef27 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -305,6 +305,9 @@ the freeform debug tables or the native netlink messages. .RS 7 List of available JSON queries: +.RS 10 +\- bla_backbone_json|bbj +.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 vlan_json command (35d8327)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 35d8327f9d983961d4d6b7346712974f52b6d457 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 18:01:03 2021 +0200 batctl: Add vlan_json command Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 35d8327f9d983961d4d6b7346712974f52b6d457 Makefile | 1 + README.rst | 28 ++++++++++++++++++++++++++++ genl_json.c | 2 +- man/batctl.8 | 3 +++ mesh_json.c => vlan_json.c | 8 ++++---- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 15a88a5..c1212c4 100755 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ $(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)) +$(eval $(call add_command,vlan_json,y)) MANPAGE = man/batctl.8 diff --git a/README.rst b/README.rst index 9346378..606d557 100644 --- a/README.rst +++ b/README.rst @@ -1284,6 +1284,34 @@ Example:: ] +batctl vlan_json +---------------- + +Read the vlan state for an vlan on top a batman-adv interface. + +Usage:: + + batctl meshif <netdev> vid <vid> vlan_json|vj + batctl vlan <vdev> vlan_json|vj + +Example:: + + $ batctl meshif bat0 vid 0 vlan_json + { + "ap_isolation_enabled": false, + "mesh_ifindex": 9, + "mesh_ifname": "bat0", + "vlanid": 0 + } + + $ batctl vlan bat0.1 vlan_json + { + "ap_isolation_enabled": false, + "mesh_ifindex": 9, + "mesh_ifname": "bat0", + "vlanid": 1 + } + Advanced Analytics ================== diff --git a/genl_json.c b/genl_json.c index 9bdfcd5..460838b 100644 --- a/genl_json.c +++ b/genl_json.c @@ -383,7 +383,7 @@ static const struct nla_policy_json batadv_genl_json[NUM_BATADV_ATTR] = { }, [BATADV_ATTR_VLANID] = { .name = "vlanid", - .cb = nljson_print_vlanid, + .cb = nljson_print_uint16, }, [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { .name = "aggregated_ogms_enabled", diff --git a/man/batctl.8 b/man/batctl.8 index 6abeb08..80077bb 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -341,6 +341,9 @@ List of available JSON queries: .RE \- transtable_local_json|tlj .RE +.RE +\- vlan_json|vj +.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/mesh_json.c b/vlan_json.c similarity index 61% copy from mesh_json.c copy to vlan_json.c index 47bba11..e1f7fab 100644 --- a/mesh_json.c +++ b/vlan_json.c @@ -10,11 +10,11 @@ #include "genl_json.h" -static struct json_query_data batctl_json_query_mesh = { +static struct json_query_data batctl_json_query_vlan = { .nlm_flags = 0, - .cmd = BATADV_CMD_GET_MESH, + .cmd = BATADV_CMD_GET_VLAN, }; -COMMAND_NAMED(JSON_MIF, mesh_json, "mj", handle_json_query, +COMMAND_NAMED(JSON_VID, vlan_json, "vj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_mesh, ""); + &batctl_json_query_vlan, "");

1 0

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

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 4b67ab08eee49980d20199cbb9ea9f4cb0072093 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri May 14 16:23:03 2021 +0200 batctl: Add bla_claim_json command Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4b67ab08eee49980d20199cbb9ea9f4cb0072093 Makefile | 1 + README.rst | 40 +++++++++++++++++++++++++++++++++ bla_backbone_json.c => bla_claim_json.c | 8 +++---- man/batctl.8 | 3 +++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 944e985..6c57055 100755 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ $(eval $(call add_command,ap_isolation,y)) $(eval $(call add_command,backbonetable,y)) $(eval $(call add_command,bisect_iv,$(CONFIG_BATCTL_BISECT))) $(eval $(call add_command,bla_backbone_json,y)) +$(eval $(call add_command,bla_claim_json,y)) $(eval $(call add_command,bonding,y)) $(eval $(call add_command,bridge_loop_avoidance,y)) $(eval $(call add_command,claimtable,y)) diff --git a/README.rst b/README.rst index cd708c3..4129ddd 100644 --- a/README.rst +++ b/README.rst @@ -737,6 +737,46 @@ Example:: ] +batctl bla_claim_json +--------------------- + +Query batman-adv for the entries in the known claims table of +bridge loop avoidance. Only claims from the current node will have have the +key-value ``"bla_own": true``. + +Usage:: + + batctl meshif <netdev> bla_claim_json|clj + +Example:: + + $ batctl meshif bat0 bla_claim_json | json_pp + [ + { + "bla_address": "a2:30:36:05:e6:32", + "bla_backbone": "02:ba:de:af:fe:01", + "bla_crc": 60445, + "bla_own": true, + "bla_vid": -1 + }, + { + "bla_address": "24:18:1d:1c:d2:13", + "bla_backbone": "02:ba:de:af:fe:01", + "bla_crc": 60445, + "bla_own": true, + "bla_vid": -1 + }, + { + "bla_address": "68:72:51:68:67:7a", + "bla_backbone": "02:ba:de:af:fe:01", + "bla_crc": 60445, + "bla_own": true, + "bla_vid": -1 + }, + [...] + ] + + Advanced Analytics ================== diff --git a/bla_backbone_json.c b/bla_claim_json.c similarity index 58% copy from bla_backbone_json.c copy to bla_claim_json.c index 5d50a9b..4ff3fff 100644 --- a/bla_backbone_json.c +++ b/bla_claim_json.c @@ -10,11 +10,11 @@ #include "genl_json.h" -static struct json_query_data batctl_json_query_bla_backbone = { +static struct json_query_data batctl_json_query_bla_claim = { .nlm_flags = NLM_F_DUMP, - .cmd = BATADV_CMD_GET_BLA_BACKBONE, + .cmd = BATADV_CMD_GET_BLA_CLAIM, }; -COMMAND_NAMED(JSON_MIF, bla_backbone_json, "bbj", handle_json_query, +COMMAND_NAMED(JSON_MIF, bla_claim_json, "clj", handle_json_query, COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, - &batctl_json_query_bla_backbone, ""); + &batctl_json_query_bla_claim, ""); diff --git a/man/batctl.8 b/man/batctl.8 index b4fef27..1ee8933 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -308,6 +308,9 @@ List of available JSON queries: .RS 10 \- bla_backbone_json|bbj .RE +.RS 10 +\- bla_claim_json|clj +.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: Introduce handler for JSON_* command types (57cc3c4)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 57cc3c472a7d5766443322b2df665ce914c1c3c6 Author: Alexander Sarmanow <asarmanow(a)gmail.com> Date: Thu May 13 16:10:34 2021 +0200 batctl: Introduce handler for JSON_* command types The JSON_MIF, JSON_HIF and JSON_VID command types will share most of their code. The handler can therefore take over the initialization of the netlink message, send the request and receive (+print) the returned data. The actual JSON query implemenations can then be done using two structs and a registration in the command list array. Signed-off-by: Alexander Sarmanow <asarmanow(a)gmail.com> [sven(a)narfation.org: fix commit message, cleanup changes, move changes to correct file, introduce common initialization of netlink message and shared print code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 57cc3c472a7d5766443322b2df665ce914c1c3c6 README.rst | 4 +++ genl_json.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ genl_json.h | 7 ++++ 3 files changed, 119 insertions(+) diff --git a/README.rst b/README.rst index ab5fa84..3d191f5 100644 --- a/README.rst +++ b/README.rst @@ -702,6 +702,10 @@ Example:: 15.0 MBit +JSON netlink query helper +========================= + + Advanced Analytics ================== diff --git a/genl_json.c b/genl_json.c index 967790c..9bdfcd5 100644 --- a/genl_json.c +++ b/genl_json.c @@ -11,6 +11,7 @@ #include <arpa/inet.h> #include <ctype.h> +#include <getopt.h> #include <inttypes.h> #include <netinet/in.h> #include <netlink/netlink.h> @@ -18,7 +19,9 @@ #include <stdbool.h> #include <stdio.h> #include <sys/socket.h> +#include <unistd.h> +#include "functions.h" #include "batadv_packet.h" #include "batman_adv.h" #include "netlink.h" @@ -496,3 +499,108 @@ void netlink_print_json_entries(struct nlattr *attrs[], struct json_opts *json_o putchar('}'); } + +static void json_query_usage(struct state *state) +{ + fprintf(stderr, "Usage: batctl [options] %s|%s [parameters]\n", + state->cmd->name, state->cmd->abbr); + fprintf(stderr, "parameters:\n"); + fprintf(stderr, " \t -h print this help\n"); +} + +static int netlink_print_query_json_cb(struct nl_msg *msg, void *arg) +{ + struct nlattr *attrs[BATADV_ATTR_MAX+1]; + struct nlmsghdr *nlh = nlmsg_hdr(msg); + struct nlquery_opts *query_opts = arg; + struct json_opts *json_opts; + struct genlmsghdr *ghdr; + + json_opts = container_of(query_opts, struct json_opts, query_opts); + + if (!genlmsg_valid_hdr(nlh, 0)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + ghdr = nlmsg_data(nlh); + + if (nla_parse(attrs, BATADV_ATTR_MAX, genlmsg_attrdata(ghdr, 0), + genlmsg_len(ghdr), batadv_netlink_policy)) { + fputs("Received invalid data from kernel.\n", stderr); + exit(1); + } + + netlink_print_json_entries(attrs, json_opts); + + return NL_OK; +} + +static int netlink_print_query_json_attributes(struct nl_msg *msg, void *arg) +{ + struct state *state = arg; + + switch (state->selector) { + case SP_NONE_OR_MESHIF: + case SP_MESHIF: + break; + case SP_VLAN: + nla_put_u16(msg, BATADV_ATTR_VLANID, state->vid); + break; + case SP_HARDIF: + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, state->hif); + break; + } + + return 0; +} + +static int netlink_print_query_json(struct state *state, + struct json_query_data *json_query) +{ + int ret; + struct json_opts json_opts = { + .is_first = true, + .query_opts = { + .err = 0, + }, + }; + + if (json_query->nlm_flags & NLM_F_DUMP) + putchar('['); + + ret = netlink_query_common(state, state->mesh_ifindex, + json_query->cmd, + netlink_print_query_json_cb, + netlink_print_query_json_attributes, + json_query->nlm_flags, + &json_opts.query_opts); + + if (json_query->nlm_flags & NLM_F_DUMP) + puts("]"); + else + putchar('\n'); + + return ret; +} + +int handle_json_query(struct state *state, int argc, char **argv) +{ + struct json_query_data *json_query = state->cmd->arg; + int optchar; + int err; + + while ((optchar = getopt(argc, argv, "h")) != -1) { + switch (optchar) { + case 'h': + json_query_usage(state); + return EXIT_SUCCESS; + } + } + + check_root_or_die("batctl"); + + err = netlink_print_query_json(state, json_query); + + return err; +} diff --git a/genl_json.h b/genl_json.h index 87f4d6f..54f7995 100644 --- a/genl_json.h +++ b/genl_json.h @@ -11,6 +11,7 @@ #include <stdint.h> +#include "batman_adv.h" #include "netlink.h" struct json_opts { @@ -18,6 +19,12 @@ struct json_opts { struct nlquery_opts query_opts; }; +struct json_query_data { + int nlm_flags; + enum batadv_nl_commands cmd; +}; + void netlink_print_json_entries(struct nlattr *attrs[], struct json_opts *json_opts); +int handle_json_query(struct state *state, int argc, char **argv); #endif /* _BATCTL_GENLJSON_H */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits