Repository : ssh://git@diktynna/batctl

On branch : master

commit a92de0e990c1b90914ae63e2c426cdfdf93bb978 Author: Alexander Sarmanow asarmanow@gmail.com Date: Thu May 13 16:02:33 2021 +0200

batctl: netlink: Make netlink_query_common non-static

With a view to the introduction of a JSON debug support the netlink_query_common can be used for simple query of batman-adv attributes without any filters.

Signed-off-by: Alexander Sarmanow asarmanow@gmail.com [sven@narfation.org: fix commit message, cleanup changes] Signed-off-by: Sven Eckelmann sven@narfation.org

a92de0e990c1b90914ae63e2c426cdfdf93bb978 netlink.c | 12 ++++-------- netlink.h | 8 ++++++++ 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/netlink.c b/netlink.c index eb5888b..2c45645 100644 --- a/netlink.c +++ b/netlink.c @@ -29,10 +29,6 @@ #include "functions.h" #include "main.h"

-struct nlquery_opts { - int err; -}; - struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { [BATADV_ATTR_VERSION] = { .type = NLA_STRING, @@ -623,10 +619,10 @@ static int nlquery_stop_cb(struct nl_msg *msg, void *arg) return NL_STOP; }

-static 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) +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) { struct nl_msg *msg; struct nl_cb *cb; diff --git a/netlink.h b/netlink.h index 2cc5862..20fb39b 100644 --- a/netlink.h +++ b/netlink.h @@ -25,6 +25,10 @@ struct print_opts { uint8_t nl_cmd; };

+struct nlquery_opts { + int err; +}; + struct ether_addr;

int netlink_create(struct state *state); @@ -54,6 +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 flags, struct nlquery_opts *query_opts); + extern char algo_name_buf[256]; extern int last_err; extern int64_t mcast_flags;