commits

commits@lists.open-mesh.org

1 participants
12401 discussions

[batctl] master: batctl: Avoid boolean in structures (62af39f)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 62af39f7f7be62d4ecff1c57a1ea4fadf28f7b3e Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:39:06 2021 +0200 batctl: Avoid boolean in structures Booleans inside structures to really only store a single bit of information is often a waste of space because a boolean is stored using multiple bytes. While this is not too relevant for batctl, just use the same way of storing such values as in the rest of batman-adv to avoid different paradigms in related code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 62af39f7f7be62d4ecff1c57a1ea4fadf28f7b3e netlink.c | 8 ++++---- throughputmeter.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netlink.c b/netlink.c index 7afd38b..eb5888b 100644 --- a/netlink.c +++ b/netlink.c @@ -677,7 +677,7 @@ static const int translate_mac_netlink_mandatory[] = { struct translate_mac_netlink_opts { struct ether_addr mac; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; @@ -765,7 +765,7 @@ struct get_nexthop_netlink_opts { struct ether_addr mac; uint8_t *nexthop; char *ifname; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; @@ -865,7 +865,7 @@ static const int get_primarymac_netlink_mandatory[] = { struct get_primarymac_netlink_opts { uint8_t *primarymac; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; @@ -938,7 +938,7 @@ int get_primarymac_netlink(struct state *state, uint8_t *primarymac) struct get_algoname_netlink_opts { char *algoname; size_t algoname_len; - bool found; + uint8_t found:1; struct nlquery_opts query_opts; }; diff --git a/throughputmeter.c b/throughputmeter.c index 7f89651..fb1e35b 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -38,16 +38,16 @@ static struct state *tp_state; struct tp_result { int error; - bool found; uint32_t cookie; uint8_t return_value; + uint8_t found:1; uint32_t test_time; uint64_t total_bytes; }; struct tp_cookie { int error; - bool found; + uint8_t found:1; uint32_t cookie; };

1 0

[batctl] master: batctl: Realign netlink_policy array (7efb5de)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 7efb5de35f16272a5cdd0d6733d60727a11f5ed9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:24:59 2021 +0200 batctl: Realign netlink_policy array The netlink_policy contains an array of structures with several members in it. But the initialization of the entries of this array was not aligned like any other initialization in the batctl code - instead it was tried to have everything on the same same line. This resulted in rather long lines and could result in larger commits which just try to realign the whole table when a new entry with a long identifier was added. Just realign the array to better match the rest of the code. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7efb5de35f16272a5cdd0d6733d60727a11f5ed9 netlink.c | 280 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 200 insertions(+), 80 deletions(-) diff --git a/netlink.c b/netlink.c index c821d0f..7afd38b 100644 --- a/netlink.c +++ b/netlink.c @@ -34,86 +34,206 @@ struct nlquery_opts { }; struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { - [BATADV_ATTR_VERSION] = { .type = NLA_STRING }, - [BATADV_ATTR_ALGO_NAME] = { .type = NLA_STRING }, - [BATADV_ATTR_MESH_IFINDEX] = { .type = NLA_U32 }, - [BATADV_ATTR_MESH_IFNAME] = { .type = NLA_STRING, - .maxlen = IFNAMSIZ }, - [BATADV_ATTR_MESH_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_HARD_IFINDEX] = { .type = NLA_U32 }, - [BATADV_ATTR_HARD_IFNAME] = { .type = NLA_STRING, - .maxlen = IFNAMSIZ }, - [BATADV_ATTR_HARD_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_ORIG_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_TPMETER_RESULT] = { .type = NLA_U8 }, - [BATADV_ATTR_TPMETER_TEST_TIME] = { .type = NLA_U32 }, - [BATADV_ATTR_TPMETER_BYTES] = { .type = NLA_U64 }, - [BATADV_ATTR_TPMETER_COOKIE] = { .type = NLA_U32 }, - [BATADV_ATTR_PAD] = { .type = NLA_UNSPEC }, - [BATADV_ATTR_ACTIVE] = { .type = NLA_FLAG }, - [BATADV_ATTR_TT_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_TT_TTVN] = { .type = NLA_U8 }, - [BATADV_ATTR_TT_LAST_TTVN] = { .type = NLA_U8 }, - [BATADV_ATTR_TT_CRC32] = { .type = NLA_U32 }, - [BATADV_ATTR_TT_VID] = { .type = NLA_U16 }, - [BATADV_ATTR_TT_FLAGS] = { .type = NLA_U32 }, - [BATADV_ATTR_FLAG_BEST] = { .type = NLA_FLAG }, - [BATADV_ATTR_LAST_SEEN_MSECS] = { .type = NLA_U32 }, - [BATADV_ATTR_NEIGH_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_TQ] = { .type = NLA_U8 }, - [BATADV_ATTR_THROUGHPUT] = { .type = NLA_U32 }, - [BATADV_ATTR_BANDWIDTH_UP] = { .type = NLA_U32 }, - [BATADV_ATTR_BANDWIDTH_DOWN] = { .type = NLA_U32 }, - [BATADV_ATTR_ROUTER] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_BLA_OWN] = { .type = NLA_FLAG }, - [BATADV_ATTR_BLA_ADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_BLA_VID] = { .type = NLA_U16 }, - [BATADV_ATTR_BLA_BACKBONE] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_BLA_CRC] = { .type = NLA_U16 }, - [BATADV_ATTR_DAT_CACHE_IP4ADDRESS] = { .type = NLA_U32 }, - [BATADV_ATTR_DAT_CACHE_HWADDRESS] = { .type = NLA_UNSPEC, - .minlen = ETH_ALEN, - .maxlen = ETH_ALEN }, - [BATADV_ATTR_DAT_CACHE_VID] = { .type = NLA_U16 }, - [BATADV_ATTR_MCAST_FLAGS] = { .type = NLA_U32 }, - [BATADV_ATTR_MCAST_FLAGS_PRIV] = { .type = NLA_U32 }, - [BATADV_ATTR_VLANID] = { .type = NLA_U16 }, - [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_AP_ISOLATION_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_ISOLATION_MARK] = { .type = NLA_U32 }, - [BATADV_ATTR_ISOLATION_MASK] = { .type = NLA_U32 }, - [BATADV_ATTR_BONDING_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_FRAGMENTATION_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_GW_BANDWIDTH_DOWN] = { .type = NLA_U32 }, - [BATADV_ATTR_GW_BANDWIDTH_UP] = { .type = NLA_U32 }, - [BATADV_ATTR_GW_MODE] = { .type = NLA_U8 }, - [BATADV_ATTR_GW_SEL_CLASS] = { .type = NLA_U32 }, - [BATADV_ATTR_HOP_PENALTY] = { .type = NLA_U8 }, - [BATADV_ATTR_LOG_LEVEL] = { .type = NLA_U32 }, - [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_MULTICAST_FANOUT] = { .type = NLA_U32 }, - [BATADV_ATTR_NETWORK_CODING_ENABLED] = { .type = NLA_U8 }, - [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, - [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, - [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { .type = NLA_U32 }, + [BATADV_ATTR_VERSION] = { + .type = NLA_STRING, + }, + [BATADV_ATTR_ALGO_NAME] = { + .type = NLA_STRING, + }, + [BATADV_ATTR_MESH_IFINDEX] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MESH_IFNAME] = { + .type = NLA_STRING, + .maxlen = IFNAMSIZ, + }, + [BATADV_ATTR_MESH_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_HARD_IFINDEX] = { + .type = NLA_U32, + }, + [BATADV_ATTR_HARD_IFNAME] = { + .type = NLA_STRING, + .maxlen = IFNAMSIZ, + }, + [BATADV_ATTR_HARD_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_ORIG_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_TPMETER_RESULT] = { + .type = NLA_U8, + }, + [BATADV_ATTR_TPMETER_TEST_TIME] = { + .type = NLA_U32, + }, + [BATADV_ATTR_TPMETER_BYTES] = { + .type = NLA_U64, + }, + [BATADV_ATTR_TPMETER_COOKIE] = { + .type = NLA_U32, + }, + [BATADV_ATTR_PAD] = { + .type = NLA_UNSPEC, + }, + [BATADV_ATTR_ACTIVE] = { + .type = NLA_FLAG, + }, + [BATADV_ATTR_TT_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_TT_TTVN] = { + .type = NLA_U8, + }, + [BATADV_ATTR_TT_LAST_TTVN] = { + .type = NLA_U8, + }, + [BATADV_ATTR_TT_CRC32] = { + .type = NLA_U32, + }, + [BATADV_ATTR_TT_VID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_TT_FLAGS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_FLAG_BEST] = { + .type = NLA_FLAG, + }, + [BATADV_ATTR_LAST_SEEN_MSECS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_NEIGH_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_TQ] = { + .type = NLA_U8, + }, + [BATADV_ATTR_THROUGHPUT] = { + .type = NLA_U32, + }, + [BATADV_ATTR_BANDWIDTH_UP] = { + .type = NLA_U32, + }, + [BATADV_ATTR_BANDWIDTH_DOWN] = { + .type = NLA_U32, + }, + [BATADV_ATTR_ROUTER] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_BLA_OWN] = { + .type = NLA_FLAG, + }, + [BATADV_ATTR_BLA_ADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_BLA_VID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_BLA_BACKBONE] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_BLA_CRC] = { + .type = NLA_U16, + }, + [BATADV_ATTR_DAT_CACHE_IP4ADDRESS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_DAT_CACHE_HWADDRESS] = { + .type = NLA_UNSPEC, + .minlen = ETH_ALEN, + .maxlen = ETH_ALEN, + }, + [BATADV_ATTR_DAT_CACHE_VID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_MCAST_FLAGS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MCAST_FLAGS_PRIV] = { + .type = NLA_U32, + }, + [BATADV_ATTR_VLANID] = { + .type = NLA_U16, + }, + [BATADV_ATTR_AGGREGATED_OGMS_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_AP_ISOLATION_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_ISOLATION_MARK] = { + .type = NLA_U32, + }, + [BATADV_ATTR_ISOLATION_MASK] = { + .type = NLA_U32, + }, + [BATADV_ATTR_BONDING_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_FRAGMENTATION_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_GW_BANDWIDTH_DOWN] = { + .type = NLA_U32, + }, + [BATADV_ATTR_GW_BANDWIDTH_UP] = { + .type = NLA_U32, + }, + [BATADV_ATTR_GW_MODE] = { + .type = NLA_U8, + }, + [BATADV_ATTR_GW_SEL_CLASS] = { + .type = NLA_U32, + }, + [BATADV_ATTR_HOP_PENALTY] = { + .type = NLA_U8, + }, + [BATADV_ATTR_LOG_LEVEL] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_NETWORK_CODING_ENABLED] = { + .type = NLA_U8, + }, + [BATADV_ATTR_ORIG_INTERVAL] = { + .type = NLA_U32, + }, + [BATADV_ATTR_ELP_INTERVAL] = { + .type = NLA_U32, + }, + [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { + .type = NLA_U32, + }, + [BATADV_ATTR_MULTICAST_FANOUT] = { + .type = NLA_U32, + }, }; int netlink_create(struct state *state)

1 0

[batctl] master: batctl: throughputmeter: Use global genl socket (b25e030)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit b25e030c8e5e1884666d3e21713fd87c0d776e50 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 17:01:59 2021 +0200 batctl: throughputmeter: Use global genl socket The batctl framework can take care of creating the netlink socket and gathering the data for a mesh interface. It is not necessary to duplicate all the code to create, setup and destroy the batadv genl socket for a standard socket. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b25e030c8e5e1884666d3e21713fd87c0d776e50 throughputmeter.c | 105 +++++++++++------------------------------------------- 1 file changed, 21 insertions(+), 84 deletions(-) diff --git a/throughputmeter.c b/throughputmeter.c index f50f521..7f89651 100644 --- a/throughputmeter.c +++ b/throughputmeter.c @@ -34,7 +34,7 @@ #include "netlink.h" static struct ether_addr *dst_mac; -static char *tp_mesh_iface; +static struct state *tp_state; struct tp_result { int error; @@ -151,62 +151,34 @@ static int tp_meter_cookie_callback(struct nl_msg *msg, void *arg) return NL_OK; } -static int tp_meter_start(char *mesh_iface, struct ether_addr *dst_mac, + +static int tp_meter_start(struct state *state, struct ether_addr *dst_mac, uint32_t time, struct tp_cookie *cookie) { - struct nl_sock *sock; struct nl_msg *msg; struct nl_cb *cb; - int ifindex; - int family; - int ret; int err = 0; - sock = nl_socket_alloc(); - if (!sock) - return -ENOMEM; - - ret = genl_connect(sock); - if (ret < 0) { - err = -EOPNOTSUPP; - goto out; - } - - family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) { - err = -EOPNOTSUPP; - goto out; - } - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - fprintf(stderr, "Interface %s is unknown\n", mesh_iface); - err = -ENODEV; - goto out; - } - cb = nl_cb_alloc(NL_CB_DEFAULT); nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, tp_meter_cookie_callback, cookie); nl_cb_err(cb, NL_CB_CUSTOM, tpmeter_nl_print_error, cookie); msg = nlmsg_alloc(); - if (!msg) { - err = -ENOMEM; - goto out; - } + if (!msg) + return -ENOMEM; - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, 0, BATADV_CMD_TP_METER, 1); - nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, ifindex); + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, state->mesh_ifindex); nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, dst_mac); nla_put_u32(msg, BATADV_ATTR_TPMETER_TEST_TIME, time); - nl_send_auto_complete(sock, msg); + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); - nl_recvmsgs(sock, cb); + nl_recvmsgs(state->sock, cb); nl_cb_put(cb); @@ -215,9 +187,6 @@ static int tp_meter_start(char *mesh_iface, struct ether_addr *dst_mac, else if (!cookie->found) err= -EINVAL; -out: - nl_socket_free(sock); - return err; } @@ -251,57 +220,24 @@ static int tp_recv_result(struct nl_sock *sock, struct tp_result *result) return err; } -static int tp_meter_stop(char *mesh_iface, struct ether_addr *dst_mac) +static int tp_meter_stop(struct state *state, struct ether_addr *dst_mac) { - struct nl_sock *sock; struct nl_msg *msg; - int ifindex; - int family; - int ret; - int err = 0; - - sock = nl_socket_alloc(); - if (!sock) - return -ENOMEM; - - ret = genl_connect(sock); - if (ret < 0) { - err = -EOPNOTSUPP; - goto out; - } - - family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) { - err = -EOPNOTSUPP; - goto out; - } - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - fprintf(stderr, "Interface %s is unknown\n", mesh_iface); - err = -ENODEV; - goto out; - } msg = nlmsg_alloc(); - if (!msg) { - err = -ENOMEM; - goto out; - } + if (!msg) + return -ENOMEM; - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, 0, BATADV_CMD_TP_METER_CANCEL, 1); - nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, ifindex); + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, state->mesh_ifindex); nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, dst_mac); - nl_send_auto_complete(sock, msg); + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); -out: - nl_socket_free(sock); - - return err; + return 0; } static struct nl_sock *tp_prepare_listening_sock(void) @@ -358,7 +294,7 @@ void tp_sig_handler(int sig) case SIGINT: case SIGTERM: fflush(stdout); - tp_meter_stop(tp_mesh_iface, dst_mac); + tp_meter_stop(tp_state, dst_mac); break; default: break; @@ -443,7 +379,7 @@ static int throughputmeter(struct state *state, int argc, char **argv) dst_string = ether_ntoa_long(dst_mac); /* for sighandler */ - tp_mesh_iface = state->mesh_iface; + tp_state = state; signal(SIGINT, tp_sig_handler); signal(SIGTERM, tp_sig_handler); @@ -451,7 +387,7 @@ static int throughputmeter(struct state *state, int argc, char **argv) if (!listen_sock) goto out; - ret = tp_meter_start(state->mesh_iface, dst_mac, time, &cookie); + ret = tp_meter_start(state, dst_mac, time, &cookie); if (ret < 0) { printf("Failed to send tp_meter request to kernel: %d\n", ret); goto out; @@ -529,5 +465,6 @@ out: return ret; } -COMMAND(SUBCOMMAND_MIF, throughputmeter, "tp", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, throughputmeter, "tp", + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, NULL, "<destination> \tstart a throughput measurement");

1 0

[batctl] master: batctl: originators: Get outgoing ifname from netlink (6aa8de3)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 6aa8de3676d8b4c6cfe5c27ad2ee985e3bc56fdf Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:07:31 2021 +0200 batctl: originators: Get outgoing ifname from netlink There is no need to gather the interface name for an outgoing interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this originator table entry. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 6aa8de3676d8b4c6cfe5c27ad2ee985e3bc56fdf originators.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/originators.c b/originators.c index a8b313e..9f4f526 100644 --- a/originators.c +++ b/originators.c @@ -40,12 +40,14 @@ static int originators_callback(struct nl_msg *msg, void *arg) struct nlmsghdr *nlh = nlmsg_hdr(msg); int last_seen_msecs, last_seen_secs; struct print_opts *opts = arg; + char ifname_buf[IF_NAMESIZE]; struct bat_host *bat_host; struct genlmsghdr *ghdr; - char ifname[IF_NAMESIZE]; + uint32_t ifindex; float last_seen; uint8_t *neigh; uint8_t *orig; + char *ifname; char c = ' '; uint8_t tq; @@ -74,9 +76,16 @@ static int originators_callback(struct nl_msg *msg, void *arg) orig = nla_data(attrs[BATADV_ATTR_ORIG_ADDRESS]); neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); - if (!if_indextoname(nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]), - ifname)) - ifname[0] = '\0'; + if (attrs[BATADV_ATTR_HARD_IFNAME]) { + ifname = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); + if (!if_indextoname(ifindex, ifname_buf)) + ifname_buf[0] = '\0'; + + ifname = ifname_buf; + } if (attrs[BATADV_ATTR_FLAG_BEST]) c = '*';

1 0

[batctl] master: batctl: neighbors: Get outgoing ifname from netlink (784009d)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 784009d650986b08ca8318bc5373a9151354f5ae Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:07:32 2021 +0200 batctl: neighbors: Get outgoing ifname from netlink There is no need to gather the interface name for an outgoing interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this neighbor table entry. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 784009d650986b08ca8318bc5373a9151354f5ae neighbors.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/neighbors.c b/neighbors.c index af76d0f..3102b0e 100644 --- a/neighbors.c +++ b/neighbors.c @@ -36,10 +36,12 @@ static int neighbors_callback(struct nl_msg *msg, void *arg) struct nlmsghdr *nlh = nlmsg_hdr(msg); int last_seen_msecs, last_seen_secs; struct print_opts *opts = arg; + char ifname_buf[IF_NAMESIZE]; struct bat_host *bat_host; - char ifname[IF_NAMESIZE]; struct genlmsghdr *ghdr; + uint32_t ifindex; uint8_t *neigh; + char *ifname; if (!genlmsg_valid_hdr(nlh, 0)) { fputs("Received invalid data from kernel.\n", stderr); @@ -66,9 +68,16 @@ static int neighbors_callback(struct nl_msg *msg, void *arg) neigh = nla_data(attrs[BATADV_ATTR_NEIGH_ADDRESS]); bat_host = bat_hosts_find_by_mac((char *)neigh); - if (!if_indextoname(nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]), - ifname)) - ifname[0] = '\0'; + if (attrs[BATADV_ATTR_HARD_IFNAME]) { + ifname = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); + if (!if_indextoname(ifindex, ifname_buf)) + ifname_buf[0] = '\0'; + + ifname = ifname_buf; + } last_seen_msecs = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]); last_seen_secs = last_seen_msecs / 1000;

1 0

[batctl] master: batctl: ping: Get outgoing ifname from netlink (426e48c)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 426e48c8d9caa5972f305169641236e857be8c03 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:07:33 2021 +0200 batctl: ping: Get outgoing ifname from netlink There is no need to gather the interface name for an outgoing interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this originator table entry. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 426e48c8d9caa5972f305169641236e857be8c03 netlink.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/netlink.c b/netlink.c index b8bca30..c821d0f 100644 --- a/netlink.c +++ b/netlink.c @@ -693,9 +693,16 @@ static int get_nexthop_netlink_cb(struct nl_msg *msg, void *arg) /* save result */ memcpy(opts->nexthop, neigh, ETH_ALEN); - ifname = if_indextoname(index, opts->ifname); - if (!ifname) - return NL_OK; + + if (attrs[BATADV_ATTR_HARD_IFNAME]) { + ifname = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + strncpy(opts->ifname, ifname, IFNAMSIZ); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + ifname = if_indextoname(index, opts->ifname); + if (!ifname) + return NL_OK; + } opts->found = true; opts->query_opts.err = 0;

1 0

[batctl] master: batctl: event: Get ifname from netlink message (d12322e)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit d12322eeb361bbc538c4cadaf6d5e44a0a9822ca Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 15:07:34 2021 +0200 batctl: event: Get ifname from netlink message There is no need to gather the interface name for an interface via a different syscall(s) when the kernel directly provides this information in the netlink message for this event. batman-adv provides this functionality with Linux 5.14/batman-adv 2021.2. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d12322eeb361bbc538c4cadaf6d5e44a0a9822ca event.c | 52 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/event.c b/event.c index 955fe11..274f99f 100644 --- a/event.c +++ b/event.c @@ -174,10 +174,15 @@ static void event_parse_set_mesh(struct nlattr **attrs) ARRAY_SIZE(mesh_mandatory))) return; - mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); - meshif_name = if_indextoname(mesh_ifindex, meshif_buf); - if (!meshif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + meshif_name = nla_get_string(attrs[BATADV_ATTR_MESH_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); + meshif_name = if_indextoname(mesh_ifindex, meshif_buf); + if (!meshif_name) + return; + } printf("%s: set mesh:\n", meshif_name); @@ -305,15 +310,25 @@ static void event_parse_set_hardif(struct nlattr **attrs) ARRAY_SIZE(hardif_mandatory))) return; - mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); - meshif_name = if_indextoname(mesh_ifindex, meshif_buf); - if (!meshif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + meshif_name = nla_get_string(attrs[BATADV_ATTR_MESH_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); + meshif_name = if_indextoname(mesh_ifindex, meshif_buf); + if (!meshif_name) + return; + } - hardif_ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); - hardif_name = if_indextoname(hardif_ifindex, hardif_buf); - if (!hardif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + hardif_name = nla_get_string(attrs[BATADV_ATTR_HARD_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + hardif_ifindex = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]); + hardif_name = if_indextoname(hardif_ifindex, hardif_buf); + if (!hardif_name) + return; + } printf("%s (%s): set hardif:\n", meshif_name, hardif_name); @@ -350,10 +365,15 @@ static void event_parse_set_vlan(struct nlattr **attrs) ARRAY_SIZE(vlan_mandatory))) return; - mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); - meshif_name = if_indextoname(mesh_ifindex, meshif_buf); - if (!meshif_name) - return; + if (attrs[BATADV_ATTR_MESH_IFNAME]) { + meshif_name = nla_get_string(attrs[BATADV_ATTR_MESH_IFNAME]); + } else { + /* compatibility for Linux < 5.14/batman-adv < 2021.2 */ + mesh_ifindex = nla_get_u32(attrs[BATADV_ATTR_MESH_IFINDEX]); + meshif_name = if_indextoname(mesh_ifindex, meshif_buf); + if (!meshif_name) + return; + } vid = nla_get_u16(attrs[BATADV_ATTR_VLANID]);

1 0

[batctl] master: batctl: interface: List using shared genl socket (ff4f4de)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit ff4f4de578867460b78a4eb63977ae53c0a66f02 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 18:37:15 2021 +0200 batctl: interface: List using shared genl socket The interface subcommand doesn't need to allocate a new netlink socket to query the state of a single interface. But it can also not use the socket which is automatically pre-configured by COMMAND_FLAG_NETLINK because the (main sub)command might also be started for interfaces which might not exist yet. Instead use the shared functions to pre-allocate the necessary state information when calling the "list" sub-subcommand. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- ff4f4de578867460b78a4eb63977ae53c0a66f02 interface.c | 77 +++++++++++++++++++++++++------------------------------------ 1 file changed, 31 insertions(+), 46 deletions(-) diff --git a/interface.c b/interface.c index cf9c0c3..a96a328 100644 --- a/interface.c +++ b/interface.c @@ -62,65 +62,46 @@ static int get_iface_status_netlink_parse(struct nl_msg *msg, void *arg) iface_status[IFACE_STATUS_LEN - 1] = '\0'; - return NL_STOP; + return NL_OK; } -static char *get_iface_status_netlink(unsigned int meshif, unsigned int hardif, +static char *get_iface_status_netlink(struct state *state, unsigned int hardif, char *iface_status) { char *ret_status = NULL; - struct nl_sock *sock; struct nl_msg *msg; - int batadv_family; - struct nl_cb *cb; int ret; iface_status[0] = '\0'; - sock = nl_socket_alloc(); - if (!sock) - return NULL; - - ret = genl_connect(sock); - if (ret < 0) - goto err_free_sock; - - batadv_family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (batadv_family < 0) - goto err_free_sock; - - cb = nl_cb_alloc(NL_CB_DEFAULT); - if (!cb) - goto err_free_sock; - - nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, get_iface_status_netlink_parse, + nl_cb_set(state->cb, NL_CB_VALID, NL_CB_CUSTOM, get_iface_status_netlink_parse, iface_status); msg = nlmsg_alloc(); if (!msg) - goto err_free_cb; + return NULL; - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, batadv_family, + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, 0, BATADV_CMD_GET_HARDIF, 1); - nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, meshif); + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, state->mesh_ifindex); nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, hardif); - ret = nl_send_auto_complete(sock, msg); + ret = nl_send_auto_complete(state->sock, msg); + if (ret < 0) + goto err_free_msg; + + ret = nl_recvmsgs(state->sock, state->cb); if (ret < 0) goto err_free_msg; - nl_recvmsgs(sock, cb); + nl_wait_for_ack(state->sock); if (strlen(iface_status) > 0) ret_status = iface_status; err_free_msg: nlmsg_free(msg); -err_free_cb: - nl_cb_put(cb); -err_free_sock: - nl_socket_free(sock); return ret_status; } @@ -130,20 +111,16 @@ static struct nla_policy link_policy[IFLA_MAX + 1] = { [IFLA_MASTER] = { .type = NLA_U32 }, }; -struct print_interfaces_rtnl_arg { - int ifindex; -}; - static int print_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) { - struct print_interfaces_rtnl_arg *print_arg = arg; char iface_status[IFACE_STATUS_LEN]; struct nlattr *attrs[IFLA_MAX + 1]; + struct state *state = arg; struct ifinfomsg *ifm; + unsigned int master; char *ifname; int ret; const char *status; - int master; ifm = nlmsg_data(nlmsg_hdr(msg)); ret = nlmsg_parse(nlmsg_hdr(msg), sizeof(*ifm), attrs, IFLA_MAX, @@ -161,10 +138,10 @@ static int print_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) master = nla_get_u32(attrs[IFLA_MASTER]); /* required on older kernels which don't prefilter the results */ - if (master != print_arg->ifindex) + if (master != state->mesh_ifindex) goto err; - status = get_iface_status_netlink(master, ifm->ifi_index, iface_status); + status = get_iface_status_netlink(state, ifm->ifi_index, iface_status); if (!status) status = "<error reading status>\n"; @@ -174,21 +151,29 @@ err: return NL_OK; } -static int print_interfaces(char *mesh_iface) +static int print_interfaces(struct state *state) { - struct print_interfaces_rtnl_arg print_arg; + int ret; if (!file_exists(module_ver_path)) { fprintf(stderr, "Error - batman-adv module has not been loaded\n"); return EXIT_FAILURE; } - print_arg.ifindex = if_nametoindex(mesh_iface); - if (!print_arg.ifindex) + /* duplicated code here from the main() because interface doesn't always + * need COMMAND_FLAG_MESH_IFACE and COMMAND_FLAG_NETLINK + */ + if (check_mesh_iface(state)) return EXIT_FAILURE; - query_rtnl_link(print_arg.ifindex, print_interfaces_rtnl_parse, - &print_arg); + ret = netlink_create(state); + if (ret < 0) + return EXIT_FAILURE; + + query_rtnl_link(state->mesh_ifindex, print_interfaces_rtnl_parse, + state); + + netlink_destroy(state); return EXIT_SUCCESS; } @@ -452,7 +437,7 @@ static int interface(struct state *state, int argc, char **argv) rest_argv = &argv[optind]; if (rest_argc == 0) - return print_interfaces(state->mesh_iface); + return print_interfaces(state); check_root_or_die("batctl interface");

1 0

[batctl] master: batctl: routing_algo: List using shared genl socket (b1d342b)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit b1d342be621d1fc471bff97f60ca0c6f26de103c Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 21:14:07 2021 +0200 batctl: routing_algo: List using shared genl socket The interface subcommand doesn't need to allocate a new netlink socket to get the list of interfaces. There is already a netlink socket available which was used to query the routing algorithm of each interface. Just use this batadv genl socket to also dump the list of all available routing algorithms. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b1d342be621d1fc471bff97f60ca0c6f26de103c routing_algo.c | 53 +++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/routing_algo.c b/routing_algo.c index 8fb4fab..0adf32f 100644 --- a/routing_algo.c +++ b/routing_algo.c @@ -79,58 +79,35 @@ static int routing_algos_callback(struct nl_msg *msg, void *arg __maybe_unused) return NL_OK; } -static int print_routing_algos(void) +static int print_routing_algos(struct state *state) { - struct nl_sock *sock; struct nl_msg *msg; struct nl_cb *cb; - int family; struct print_opts opts = { .callback = routing_algos_callback, }; - sock = nl_socket_alloc(); - if (!sock) - return -ENOMEM; - - genl_connect(sock); - - family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) { - last_err = -EOPNOTSUPP; - goto err_free_sock; - } - msg = nlmsg_alloc(); - if (!msg) { - last_err = -ENOMEM; - goto err_free_sock; - } - - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, NLM_F_DUMP, - BATADV_CMD_GET_ROUTING_ALGOS, 1); - - nl_send_auto_complete(sock, msg); + if (!msg) + return -ENOMEM; + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, + NLM_F_DUMP, BATADV_CMD_GET_ROUTING_ALGOS, 1); + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); opts.remaining_header = strdup("Available routing algorithms:\n"); cb = nl_cb_alloc(NL_CB_DEFAULT); - if (!cb) { - last_err = -ENOMEM; - goto err_free_sock; - } + if (!cb) + return -ENOMEM; nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, netlink_print_common_cb, &opts); nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, netlink_stop_callback, NULL); nl_cb_err(cb, NL_CB_CUSTOM, netlink_print_error, NULL); - nl_recvmsgs(sock, cb); - -err_free_sock: - nl_socket_free(sock); + nl_recvmsgs(state->sock, cb); if (!last_err) netlink_print_remaining_header(&opts); @@ -316,19 +293,23 @@ static int routing_algo(struct state *state, int argc, char **argv) return EXIT_FAILURE; print_ra_interfaces(state); - netlink_destroy(state); res = read_file(SYS_SELECTED_RA_PATH, USE_READ_BUFF); if (res != EXIT_SUCCESS) - return EXIT_FAILURE; + goto err_free_netlink; printf("Selected routing algorithm (used when next batX interface is created):\n"); printf(" => %s\n", line_ptr); free(line_ptr); line_ptr = NULL; - print_routing_algos(); - return EXIT_SUCCESS; + print_routing_algos(state); + res = EXIT_SUCCESS; + +err_free_netlink: + netlink_destroy(state); + + return res; } COMMAND(SUBCOMMAND, routing_algo, "ra", 0, NULL,

1 0

[batctl] master: batctl: Consume genl ACKs after setting reads (0b81e8f)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 0b81e8fbaed54b9b2f68cc98b9133674287f5bd0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 21:41:44 2021 +0200 batctl: Consume genl ACKs after setting reads The kernel is sending an ACK after an successful read request via the batadv genl socket. This ack must be consumed manually after the actual message was processed. Otherwise, the next user of the socket can get confused by the unexpected ACK in the socket queue. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0b81e8fbaed54b9b2f68cc98b9133674287f5bd0 sys.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys.c b/sys.c index 6dd8c10..f1dc275 100644 --- a/sys.c +++ b/sys.c @@ -107,7 +107,13 @@ int sys_simple_nlquery(struct state *state, enum batadv_nl_commands nl_cmd, nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); - nl_recvmsgs(state->sock, state->cb); + if (callback) { + ret = nl_recvmsgs(state->sock, state->cb); + if (ret < 0) + return ret; + } + + nl_wait_for_ack(state->sock); return result; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits