commits

commits@lists.open-mesh.org

1 participants
12401 discussions

[batctl] master: batctl: Get meshif info using shared genl socket (49355f2)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit 49355f2f52e62691c112cc573cefab9c3b4527e3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 19:18:25 2021 +0200 batctl: Get meshif info using shared genl socket All subcommands which are using the netlink_get_info helper are already creating state object with batadv genl socket. It is not necessary to create a new one just to request data from the kernel. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 49355f2f52e62691c112cc573cefab9c3b4527e3 gateways.c | 3 +-- mcast_flags.c | 3 +-- netlink.c | 40 +++++++++++++--------------------------- netlink.h | 2 +- originators.c | 3 +-- 5 files changed, 17 insertions(+), 34 deletions(-) diff --git a/gateways.c b/gateways.c index 7625bd8..bdd6795 100644 --- a/gateways.c +++ b/gateways.c @@ -122,8 +122,7 @@ static int netlink_print_gateways(struct state *state, char *orig_iface, /* only parse routing algorithm name */ last_err = -EINVAL; - info_header = netlink_get_info(state->mesh_ifindex, - BATADV_CMD_GET_ORIGINATORS, NULL); + info_header = netlink_get_info(state, BATADV_CMD_GET_ORIGINATORS, NULL); free(info_header); if (strlen(algo_name_buf) == 0) diff --git a/mcast_flags.c b/mcast_flags.c index 721f549..44344e0 100644 --- a/mcast_flags.c +++ b/mcast_flags.c @@ -104,8 +104,7 @@ static int netlink_print_mcast_flags(struct state *state, char *orig_iface, int ret; /* only parse own multicast flags */ - info_header = netlink_get_info(state->mesh_ifindex, - BATADV_CMD_GET_MCAST_FLAGS, NULL); + info_header = netlink_get_info(state, BATADV_CMD_GET_MCAST_FLAGS, NULL); free(info_header); if (mcast_flags == -EOPNOTSUPP || mcast_flags_priv == -EOPNOTSUPP) diff --git a/netlink.c b/netlink.c index 31c9b01..e3a7b7c 100644 --- a/netlink.c +++ b/netlink.c @@ -339,60 +339,46 @@ static int info_callback(struct nl_msg *msg, void *arg) opts->remaining_header = NULL; } - return NL_STOP; + return NL_OK; } -char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) +char *netlink_get_info(struct state *state, uint8_t nl_cmd, const char *header) { - struct nl_sock *sock; struct nl_msg *msg; struct nl_cb *cb; - int family; struct print_opts opts = { .read_opt = 0, .nl_cmd = nl_cmd, .remaining_header = NULL, .static_header = header, }; - - sock = nl_socket_alloc(); - if (!sock) - return NULL; - - genl_connect(sock); - - family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) { - nl_socket_free(sock); - return NULL; - } + int ret; msg = nlmsg_alloc(); - if (!msg) { - nl_socket_free(sock); + if (!msg) return NULL; - } - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, 0, + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, 0, BATADV_CMD_GET_MESH_INFO, 1); - nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, ifindex); + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, state->mesh_ifindex); - nl_send_auto_complete(sock, msg); + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); cb = nl_cb_alloc(NL_CB_DEFAULT); if (!cb) - goto err_free_sock; + return NULL; nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, info_callback, &opts); nl_cb_err(cb, NL_CB_CUSTOM, netlink_print_error, NULL); - nl_recvmsgs(sock, cb); + ret = nl_recvmsgs(state->sock, cb); + if (ret < 0) + return opts.remaining_header; -err_free_sock: - nl_socket_free(sock); + nl_wait_for_ack(state->sock); return opts.remaining_header; } @@ -458,7 +444,7 @@ int netlink_print_common(struct state *state, char *orig_iface, int read_opt, printf("\033[2J\033[0;0f"); if (!(read_opt & SKIP_HEADER)) - opts.remaining_header = netlink_get_info(state->mesh_ifindex, + opts.remaining_header = netlink_get_info(state, nl_cmd, header); diff --git a/netlink.h b/netlink.h index 4ee2f39..48a2a23 100644 --- a/netlink.h +++ b/netlink.h @@ -30,7 +30,7 @@ struct ether_addr; int netlink_create(struct state *state); void netlink_destroy(struct state *state); -char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header); +char *netlink_get_info(struct state *state, uint8_t nl_cmd, const char *header); int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, struct ether_addr *mac_out); int get_nexthop_netlink(const char *mesh_iface, const struct ether_addr *mac, diff --git a/originators.c b/originators.c index 8a29dd7..a8b313e 100644 --- a/originators.c +++ b/originators.c @@ -174,8 +174,7 @@ static int netlink_print_originators(struct state *state, char *orig_iface, /* only parse routing algorithm name */ last_err = -EINVAL; - info_header = netlink_get_info(state->mesh_ifindex, - BATADV_CMD_GET_ORIGINATORS, NULL); + info_header = netlink_get_info(state, BATADV_CMD_GET_ORIGINATORS, NULL); free(info_header); if (strlen(algo_name_buf) == 0)

1 0

[batctl] master: batctl: Use common genl socket for netlink_query_common (e2a3d35)
by postmaster＠open-mesh.org 14 May '21

14 May '21

Repository : ssh://git@diktynna/batctl On branch : master >--------------------------------------------------------------- commit e2a3d3599cb2e7e09815c7156b899074a89cdc58 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon May 10 18:37:15 2021 +0200 batctl: Use common genl socket for netlink_query_common All functions which use the netlink_query_common can be changed to provide the socket for batadv genl operations in the state object. Either by manually calling netlink_create or by simply using the COMMAND_FLAG_NETLINK. This makes is unnecessary to allocate a new netlink socket and resolve the generic netlink family for each helper function call. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- e2a3d3599cb2e7e09815c7156b899074a89cdc58 functions.c | 15 +++++------ functions.h | 5 ++-- gw_mode.c | 3 ++- icmp_helper.c | 14 +++++----- icmp_helper.h | 2 +- netlink.c | 81 ++++++++++++++++++++++------------------------------------ netlink.h | 10 ++++---- ping.c | 7 ++--- routing_algo.c | 23 +++++++++++++---- traceroute.c | 7 ++--- translate.c | 5 ++-- 11 files changed, 84 insertions(+), 88 deletions(-) diff --git a/functions.c b/functions.c index 0dbf2ed..617fc5b 100644 --- a/functions.c +++ b/functions.c @@ -171,7 +171,7 @@ int read_file(const char *full_path, int read_opt) return res; } -struct ether_addr *translate_mac(const char *mesh_iface, +struct ether_addr *translate_mac(struct state *state, const struct ether_addr *mac) { struct ether_addr in_mac; @@ -188,14 +188,16 @@ struct ether_addr *translate_mac(const char *mesh_iface, if (!ether_addr_valid(in_mac.ether_addr_octet)) return mac_result; - translate_mac_netlink(mesh_iface, &in_mac, mac_result); + translate_mac_netlink(state, &in_mac, mac_result); return mac_result; } -int get_algoname(const char *mesh_iface, char *algoname, size_t algoname_len) +int get_algoname(struct state *state, unsigned int mesh_ifindex, + char *algoname, size_t algoname_len) { - return get_algoname_netlink(mesh_iface, algoname, algoname_len); + return get_algoname_netlink(state, mesh_ifindex, algoname, + algoname_len); } static int resolve_l3addr(int ai_family, const char *asc, void *l3addr) @@ -340,10 +342,7 @@ static int resolve_mac_from_parse(struct nl_msg *msg, void *arg) } err: - if (nl_arg->found) - return NL_STOP; - else - return NL_OK; + return NL_OK; } static struct ether_addr *resolve_mac_from_cache(int ai_family, diff --git a/functions.h b/functions.h index 3bb66f6..860d9f4 100644 --- a/functions.h +++ b/functions.h @@ -44,7 +44,7 @@ char *get_name_by_macaddr(struct ether_addr *mac_addr, int read_opt); char *get_name_by_macstr(char *mac_str, int read_opt); int file_exists(const char *fpath); int read_file(const char *full_path, int read_opt); -struct ether_addr *translate_mac(const char *mesh_iface, +struct ether_addr *translate_mac(struct state *state, const struct ether_addr *mac); struct ether_addr *resolve_mac(const char *asc); int query_rtnl_link(int ifindex, nl_recvmsg_msg_cb_t func, void *arg); @@ -54,7 +54,8 @@ int translate_vlan_iface(struct state *state, const char *vlandev); int translate_vid(struct state *state, const char *vidstr); int translate_hard_iface(struct state *state, const char *hardif); int guess_netdev_type(const char *netdev, enum selector_prefix *type); -int get_algoname(const char *mesh_iface, char *algoname, size_t algoname_len); +int get_algoname(struct state *state, unsigned int mesh_ifindex, + char *algoname, size_t algoname_len); int check_mesh_iface(struct state *state); int check_mesh_iface_ownership(struct state *state, char *hard_iface); diff --git a/gw_mode.c b/gw_mode.c index 0bc99e2..93f255c 100644 --- a/gw_mode.c +++ b/gw_mode.c @@ -46,7 +46,8 @@ static bool is_throughput_select_class(struct state *state) char algoname[32]; int ret; - ret = get_algoname(state->mesh_iface, algoname, sizeof(algoname)); + ret = get_algoname(state, state->mesh_ifindex, algoname, + sizeof(algoname)); /* no algo name -> assume that it is a pre-B.A.T.M.A.N. V version */ if (ret < 0) diff --git a/icmp_helper.c b/icmp_helper.c index 3aa49c0..cbb6122 100644 --- a/icmp_helper.c +++ b/icmp_helper.c @@ -314,13 +314,11 @@ static void icmp_interface_sweep(void) } } -static int icmp_interface_update(const char *mesh_iface) +static int icmp_interface_update(struct state *state) { struct icmp_interface_update_arg update_arg; - update_arg.ifindex = if_nametoindex(mesh_iface); - if (!update_arg.ifindex) - return -errno; + update_arg.ifindex = state->mesh_ifindex; /* unmark current interface - will be marked again by query */ icmp_interface_unmark(); @@ -331,7 +329,7 @@ static int icmp_interface_update(const char *mesh_iface) /* remove old interfaces */ icmp_interface_sweep(); - get_primarymac_netlink(mesh_iface, primary_mac); + get_primarymac_netlink(state, primary_mac); return 0; } @@ -355,7 +353,7 @@ static int icmp_interface_send(struct batadv_icmp_header *icmp_packet, return (int)writev(iface->sock, vector, 2); } -int icmp_interface_write(const char *mesh_iface, +int icmp_interface_write(struct state *state, struct batadv_icmp_header *icmp_packet, size_t len) { struct batadv_icmp_packet_rr *icmp_packet_rr; @@ -380,7 +378,7 @@ int icmp_interface_write(const char *mesh_iface, if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) return -EINVAL; - icmp_interface_update(mesh_iface); + icmp_interface_update(state); if (list_empty(&interface_list)) return -EFAULT; @@ -388,7 +386,7 @@ int icmp_interface_write(const char *mesh_iface, /* find best neighbor */ memcpy(&mac, icmp_packet->dst, ETH_ALEN); - ret = get_nexthop_netlink(mesh_iface, &mac, nexthop, ifname); + ret = get_nexthop_netlink(state, &mac, nexthop, ifname); if (ret < 0) goto dst_unreachable; diff --git a/icmp_helper.h b/icmp_helper.h index 6f84d34..5eed55e 100644 --- a/icmp_helper.h +++ b/icmp_helper.h @@ -35,7 +35,7 @@ struct icmp_interface { }; int icmp_interfaces_init(void); -int icmp_interface_write(const char *mesh_iface, +int icmp_interface_write(struct state *state, struct batadv_icmp_header *icmp_packet, size_t len); void icmp_interfaces_clean(void); ssize_t icmp_interface_read(struct batadv_icmp_header *icmp_packet, size_t len, diff --git a/netlink.c b/netlink.c index e3a7b7c..b8bca30 100644 --- a/netlink.c +++ b/netlink.c @@ -503,46 +503,20 @@ static int nlquery_stop_cb(struct nl_msg *msg, void *arg) return NL_STOP; } -static int netlink_query_common(const char *mesh_iface, uint8_t nl_cmd, +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) { - struct nl_sock *sock; struct nl_msg *msg; struct nl_cb *cb; - int ifindex; - int family; int ret; query_opts->err = 0; - sock = nl_socket_alloc(); - if (!sock) - return -ENOMEM; - - ret = genl_connect(sock); - if (ret < 0) { - query_opts->err = ret; - goto err_free_sock; - } - - family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) { - query_opts->err = -EOPNOTSUPP; - goto err_free_sock; - } - - ifindex = if_nametoindex(mesh_iface); - if (!ifindex) { - query_opts->err = -ENODEV; - goto err_free_sock; - } - cb = nl_cb_alloc(NL_CB_DEFAULT); - if (!cb) { - query_opts->err = -ENOMEM; - goto err_free_sock; - } + if (!cb) + return -ENOMEM; nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, callback, query_opts); nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, nlquery_stop_cb, query_opts); @@ -554,19 +528,24 @@ static int netlink_query_common(const char *mesh_iface, uint8_t nl_cmd, goto err_free_cb; } - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, flags, - nl_cmd, 1); + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, state->batadv_family, 0, + flags, nl_cmd, 1); - nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, ifindex); - nl_send_auto_complete(sock, msg); + nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, mesh_ifindex); + nl_send_auto_complete(state->sock, msg); nlmsg_free(msg); - nl_recvmsgs(sock, cb); + ret = nl_recvmsgs(state->sock, cb); + if (ret < 0) { + query_opts->err = ret; + goto err_free_cb; + } + + if (!(flags & NLM_F_DUMP)) + nl_wait_for_ack(state->sock); err_free_cb: nl_cb_put(cb); -err_free_sock: - nl_socket_free(sock); return query_opts->err; } @@ -625,10 +604,10 @@ static int translate_mac_netlink_cb(struct nl_msg *msg, void *arg) opts->found = true; opts->query_opts.err = 0; - return NL_STOP; + return NL_OK; } -int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, +int translate_mac_netlink(struct state *state, const struct ether_addr *mac, struct ether_addr *mac_out) { struct translate_mac_netlink_opts opts = { @@ -641,7 +620,7 @@ int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, memcpy(&opts.mac, mac, ETH_ALEN); - ret = netlink_query_common(mesh_iface, + ret = netlink_query_common(state, state->mesh_ifindex, BATADV_CMD_GET_TRANSTABLE_GLOBAL, translate_mac_netlink_cb, NLM_F_DUMP, &opts.query_opts); @@ -721,10 +700,10 @@ static int get_nexthop_netlink_cb(struct nl_msg *msg, void *arg) opts->found = true; opts->query_opts.err = 0; - return NL_STOP; + return NL_OK; } -int get_nexthop_netlink(const char *mesh_iface, const struct ether_addr *mac, +int get_nexthop_netlink(struct state *state, const struct ether_addr *mac, uint8_t *nexthop, char *ifname) { struct get_nexthop_netlink_opts opts = { @@ -740,7 +719,8 @@ int get_nexthop_netlink(const char *mesh_iface, const struct ether_addr *mac, opts.nexthop = nexthop; opts.ifname = ifname; - ret = netlink_query_common(mesh_iface, BATADV_CMD_GET_ORIGINATORS, + ret = netlink_query_common(state, state->mesh_ifindex, + BATADV_CMD_GET_ORIGINATORS, get_nexthop_netlink_cb, NLM_F_DUMP, &opts.query_opts); if (ret < 0) @@ -799,10 +779,10 @@ static int get_primarymac_netlink_cb(struct nl_msg *msg, void *arg) opts->found = true; opts->query_opts.err = 0; - return NL_STOP; + return NL_OK; } -int get_primarymac_netlink(const char *mesh_iface, uint8_t *primarymac) +int get_primarymac_netlink(struct state *state, uint8_t *primarymac) { struct get_primarymac_netlink_opts opts = { .primarymac = 0, @@ -815,7 +795,8 @@ int get_primarymac_netlink(const char *mesh_iface, uint8_t *primarymac) opts.primarymac = primarymac; - ret = netlink_query_common(mesh_iface, BATADV_CMD_GET_MESH_INFO, + ret = netlink_query_common(state, state->mesh_ifindex, + BATADV_CMD_GET_MESH_INFO, get_primarymac_netlink_cb, 0, &opts.query_opts); if (ret < 0) @@ -875,11 +856,11 @@ static int get_algoname_netlink_cb(struct nl_msg *msg, void *arg) opts->found = true; opts->query_opts.err = 0; - return NL_STOP; + return NL_OK; } -int get_algoname_netlink(const char *mesh_iface, char *algoname, - size_t algoname_len) +int get_algoname_netlink(struct state *state, unsigned int mesh_ifindex, + char *algoname, size_t algoname_len) { struct get_algoname_netlink_opts opts = { .algoname = algoname, @@ -891,7 +872,7 @@ int get_algoname_netlink(const char *mesh_iface, char *algoname, }; int ret; - ret = netlink_query_common(mesh_iface, BATADV_CMD_GET_MESH, + ret = netlink_query_common(state, mesh_ifindex, BATADV_CMD_GET_MESH, get_algoname_netlink_cb, 0, &opts.query_opts); if (ret < 0) diff --git a/netlink.h b/netlink.h index 48a2a23..2cc5862 100644 --- a/netlink.h +++ b/netlink.h @@ -31,13 +31,13 @@ int netlink_create(struct state *state); void netlink_destroy(struct state *state); char *netlink_get_info(struct state *state, uint8_t nl_cmd, const char *header); -int translate_mac_netlink(const char *mesh_iface, const struct ether_addr *mac, +int translate_mac_netlink(struct state *state, const struct ether_addr *mac, struct ether_addr *mac_out); -int get_nexthop_netlink(const char *mesh_iface, const struct ether_addr *mac, +int get_nexthop_netlink(struct state *state, const struct ether_addr *mac, uint8_t *nexthop, char *ifname); -int get_primarymac_netlink(const char *mesh_iface, uint8_t *primarymac); -int get_algoname_netlink(const char *mesh_iface, char *algoname, - size_t algoname_len); +int get_primarymac_netlink(struct state *state, uint8_t *primarymac); +int get_algoname_netlink(struct state *state, unsigned int mesh_ifindex, + char *algoname, size_t algoname_len); extern struct nla_policy batadv_netlink_policy[]; diff --git a/ping.c b/ping.c index a9f0913..7565dcd 100644 --- a/ping.c +++ b/ping.c @@ -136,7 +136,7 @@ static int ping(struct state *state, int argc, char **argv) } if (!disable_translate_mac) - dst_mac = translate_mac(state->mesh_iface, dst_mac); + dst_mac = translate_mac(state, dst_mac); mac_string = ether_ntoa_long(dst_mac); signal(SIGINT, sig_handler); @@ -177,7 +177,7 @@ static int ping(struct state *state, int argc, char **argv) icmp_packet_out.seqno = htons(++seq_counter); - res = icmp_interface_write(state->mesh_iface, + res = icmp_interface_write(state, (struct batadv_icmp_header *)&icmp_packet_out, packet_len); if (res < 0) { @@ -323,5 +323,6 @@ out: return ret; } -COMMAND(SUBCOMMAND_MIF, ping, "p", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, ping, "p", + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, NULL, "<destination> \tping another batman adv host via layer 2"); diff --git a/routing_algo.c b/routing_algo.c index 01376bc..8fb4fab 100644 --- a/routing_algo.c +++ b/routing_algo.c @@ -168,6 +168,7 @@ static struct nla_policy link_policy[IFLA_MAX + 1] = { struct print_ra_interfaces_rtnl_arg { uint8_t header_shown:1; + struct state *state; }; static int print_ra_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) @@ -190,7 +191,8 @@ static int print_ra_interfaces_rtnl_parse(struct nl_msg *msg, void *arg) mesh_iface = nla_get_string(attrs[IFLA_IFNAME]); - ret = get_algoname_netlink(mesh_iface, algoname, sizeof(algoname)); + ret = get_algoname_netlink(print_arg->state, ifm->ifi_index, algoname, + sizeof(algoname)); if (ret < 0) goto err; @@ -205,9 +207,11 @@ err: return NL_OK; } -static int print_ra_interfaces(void) +static int print_ra_interfaces(struct state *state) { - struct print_ra_interfaces_rtnl_arg print_arg = {}; + struct print_ra_interfaces_rtnl_arg print_arg = { + .state = state, + }; struct ifinfomsg rt_hdr = { .ifi_family = IFLA_UNSPEC, @@ -282,10 +286,11 @@ err_free_sock: return err; } -static int routing_algo(struct state *state __maybe_unused, int argc, char **argv) +static int routing_algo(struct state *state, int argc, char **argv) { int optchar; int res = EXIT_FAILURE; + int ret; while ((optchar = getopt(argc, argv, "h")) != -1) { switch (optchar) { @@ -303,7 +308,15 @@ static int routing_algo(struct state *state __maybe_unused, int argc, char **arg if (argc == 2) return write_default_ra(SYS_SELECTED_RA_PATH, argv[1]); - print_ra_interfaces(); + /* duplicated code here from the main() because interface doesn't always + * need COMMAND_FLAG_MESH_IFACE and COMMAND_FLAG_NETLINK + */ + ret = netlink_create(state); + if (ret < 0) + return EXIT_FAILURE; + + print_ra_interfaces(state); + netlink_destroy(state); res = read_file(SYS_SELECTED_RA_PATH, USE_READ_BUFF); if (res != EXIT_SUCCESS) diff --git a/traceroute.c b/traceroute.c index 517962f..40e1e8f 100644 --- a/traceroute.c +++ b/traceroute.c @@ -97,7 +97,7 @@ static int traceroute(struct state *state, int argc, char **argv) } if (!disable_translate_mac) - dst_mac = translate_mac(state->mesh_iface, dst_mac); + dst_mac = translate_mac(state, dst_mac); mac_string = ether_ntoa_long(dst_mac); @@ -124,7 +124,7 @@ static int traceroute(struct state *state, int argc, char **argv) icmp_packet_out.seqno = htons(++seq_counter); time_delta[i] = 0.0; - res = icmp_interface_write(state->mesh_iface, + res = icmp_interface_write(state, (struct batadv_icmp_header *)&icmp_packet_out, sizeof(icmp_packet_out)); if (res < 0) { @@ -209,5 +209,6 @@ out: return ret; } -COMMAND(SUBCOMMAND_MIF, traceroute, "tr", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, traceroute, "tr", + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, NULL, "<destination> \ttraceroute another batman adv host via layer 2"); diff --git a/translate.c b/translate.c index 6eef476..92451c9 100644 --- a/translate.c +++ b/translate.c @@ -50,7 +50,7 @@ static int translate(struct state *state, int argc, char **argv) } } - dst_mac = translate_mac(state->mesh_iface, dst_mac); + dst_mac = translate_mac(state, dst_mac); if (dst_mac) { mac_string = ether_ntoa_long(dst_mac); printf("%s\n", mac_string); @@ -64,5 +64,6 @@ out: return ret; } -COMMAND(SUBCOMMAND_MIF, translate, "t", COMMAND_FLAG_MESH_IFACE, NULL, +COMMAND(SUBCOMMAND_MIF, translate, "t", + COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK, NULL, "<destination> \ttranslate a destination to the originator responsible for it");

1 0

[linux-merge]linux integration; annotated tag, v4.4.268, created. v4.4.268
by postmaster＠open-mesh.org 10 May '21

10 May '21

The annotated tag, v4.4.268 has been created at c800e464eff3bef1660a92978103095a4bda5d3d (tag) tagging 47127fcd287c91397d11bcf697d12c79169528f2 (commit) replaces v4.4.267 tagged by Greg Kroah-Hartman on Wed Apr 28 12:06:23 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 4.4.268 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCJM58ACgkQONu9yGCS aT7OuxAAtqgVco5beXOzP3bpd0weBU03Gfd4vxZ1l6kgvxXv9CJCRt8ADHpW2+LG LeigpXWPXyEidiSa3URSjFnIiKfXyz6jCZ1a1qbfiJnPuO9xPq9CQ5kUhe/JkO2l k7eXivO5FyVMUxrTamW85T+WG+6FmiGocq8TnNPXp+eACxJG/33h8LHkcUEowtfP tpDuTgukXm7ebKrHUFpQfhx27vqkxwXeTOhGWsPgzhuW7pnUJiU8+TInFojtMk8R a0tMlLF3KkqBYOYd0aD8UQHC1gGF9oRKMyQ7RU78wegfBwuUVm0oFrhVceB7sU8G MXeXeEmm8wHMoo7Ncu1aviHibXa9CFjW3JFl2kyyeQisTwyx+JzmpBoVRKQnLnES KL5qIoICaEfve6Nt1nLgWvba72YPWbfaPFjR2mpzj+kSg0T5S9ySBQ24b9p8v1in yoBL1z80aXLCClcF27qWwvxhCjdIZJwolRul+tlbbBOa22R1MOWqNnFBRVq1lDQ3 +UzMa7pcziM09pwRF8VvHfmb5bWhLYJDGhKD1r+KdH0g98D4UqznuiTfvkLIEb/y e0galFzk3jCcuZN/uMOksStVFtziBeH19w3/mfKakK+/iH66EEBjhxNzJERhPSAu cthGxZD/h/xkhxypvvjz7bgJNnggIBDF3PbKZhxd4oZTODzRydQ= =gETc -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.9.268, created. v4.9.268
by postmaster＠open-mesh.org 10 May '21

10 May '21

The annotated tag, v4.9.268 has been created at 6f06e4f1f09995a45f067c5846f3558568641ad2 (tag) tagging 7eafd3bfea5a367852687cbef3eb1a526704c9b3 (commit) replaces v4.9.267 tagged by Greg Kroah-Hartman on Wed Apr 28 12:07:48 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 4.9.268 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCJM/QACgkQONu9yGCS aT4UABAAjbFHyRIQIoLvf6ofWGGftn6Mcvj8UjzTMsmagY3/o8uak+IaPOE2Vhbz a7duFZresxWj9pOFyBOMOjPhDKUSbpf2SK1vVjjb+/hWVbYtDfzHa/hzuVK8byJN 2Y6mV+RA4sGMUUVZv0impzMhr3IcBfFgcXt+GpGhaekc/KYMGazXtA5fEdFTjC92 9bKHGtTYXsW0zWurT3bKs9kI+KzXISUsgzsbrSWjIf3k4tKFeXRcsJUC9r18MZvX 3TqR54ev6MWa0rxmsxzyZ7sTpoLRQI3NyMY9+IBEWQAV58NW9HtIQ203GOLoG7O0 HSOHd/5yme8ZoPioIYezLhKtd7RrQkW0gB+PYLIwDXE+tnCBUJjeOA6sS2kpj6Zf IxUSL1yiGrheWRio4gqcaV/0EL68DfYLK30XpofNA7T6BVOBYzYqg/2S1zBt6Xxi 5gWezeydT84INiv/CBHw4KAXDcbGuPnEZu3G2/V9jMEPNChpJsmShAt6DC3QuIwx KNmAqx2rcHrn2RmA+61jD7n5AnTchhqpHmNFhrRZRpklvAUHRJP5/pZFvyMs9j5P S05SgZM2VyKbZdPiiWoMP4wBfYitDCKBPoOrYD90PAiQNq/UnJmGYFEFYMmyNW7Q v8bUDZlEtjDL5FoRBmXk9FHv1P1Dem6OCHeWmnEnuXua3leFLEY= =4WlW -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.14.232, created. v4.14.232
by postmaster＠open-mesh.org 10 May '21

10 May '21

The annotated tag, v4.14.232 has been created at a7a7ed6763b8db0a7cde334ca25e44c362de2bac (tag) tagging 7d7d1c0ab3eb7c8d8f63a126535018007823b207 (commit) replaces v4.14.231 tagged by Greg Kroah-Hartman on Wed Apr 28 12:09:11 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 4.14.232 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCJNEcACgkQONu9yGCS aT7zkA/9F5i2jM/L0buZFyq+Kq5yFAKqy+bOH86SJBpUNTngiGQOVIkyJfrhTas6 gzld1+DEkEStzJNM8dDV36iTgzd2FGzUmspAXFYas5+PcdmBAAEzIwhy0uhcFojA PinX4bDeBdJpflXxe1bE59oZInqwZud+vtgX/QrYcokmSNiQV3O3dR1UKoCTBNQx ZCsCZSqdedIghRDxS4HqhQTDoovEiG3j9c+icP1avyQduR/UYdbgMxqM4wSbBGUB iYZjlXM0mW+8Di1CP31GnuAE/89KPcJSqIH0J6HPoPlReaD29FA8pT1zlDCQedqo T/PmXYVPvQkGcr51HsfPpFhkUatBFarOaZ52MwINhwmDI9GTx5z4YteF2Y5s1ah2 jnTg/ExPQAWd6cUK7Cz/4t0AM6vQlhGtmYpj1YEM9kEPgkAoxoWXtyJGi+nrPYXo LQLolrfsqSl2cEg3jQ7STd1DAUe5jOELW+uu9KEbaDW+gwXMMWjkVmzx3/F7UIfP konZ5TBERiilerMhOdCFWL6TsIFVEQNsM0axIt0hLj47Wx2uhOFyeEPQe22iSyR/ F5amdqw4pPOUiLnzxlTx0TrmWQ2uZ8Wo6p02oU0jeQDLYlh3qyKGDi0Hynlx0TPq fkJHSfPUEjKzU7r6zIjV7Gmk+yZJhO2/LUtuHPiEipEaWf5w388= =ax51 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.19.190, created. v4.19.190
by postmaster＠open-mesh.org 10 May '21

10 May '21

The annotated tag, v4.19.190 has been created at cb7c2de6f7fed1b311e5295af9cabba9bd30575a (tag) tagging 3c8c23092588a23bf1856a64f58c37f477a413be (commit) replaces v4.19.188 tagged by Greg Kroah-Hartman on Fri May 7 10:50:33 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 4.19.190 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCU/1kACgkQONu9yGCS aT6KzBAAg01iYun5vyWHW6hIgKNeZ6CEDc6AL9awQbuwLUjaaQQKhfWfT5dUMxdQ ICE+y+obXX67Fzdd0JaTVtSOiu2stnCuEHFdJlproDYjKaodOmv6Vd1K2Noj8JyD B0tbGkQcWX57RZl3W1Lc+vyR7BRBjFSh6iHimI85y6s+q0WJvcYm2ScrQIJM3L4b Bd5g323lfPdTMgP+e/5hSHNk242hWoHY1RY/hHtOY4HoFg3M+gBYMBASrMAtdFgH bZArEAE7zIJQgdfcCWpUT5yuugZOJLXUQKIw8A5XvRtaL1cQQnH/+tlU8NZ0FqgA llyfAt0X6sO82lDPaUk3CZeFHKTljH5Gu6+0d6COyljv01xTk9fDxy0/G5t3dWU7 lDq4mutCBkLIMMU/PkEz4OVjMTy29spJk3EVpwEWeUoPmrrLf5Bx5AGe7ruadyR8 3h1IKXGF5yYf27X5mPB5049OhmeEUFS+xPEEVyioQruRv9nD+Kibp+UVgBaQstt+ qfjcIeeETfsWwUnI91kRBqgfHNf22bre3r2ve6lyNjb7bRNHcOu9GeyMxte6Iszt T+ifrLhHeGzKdrkDuZ8RY+zjK0iZgNVGfl4eXk8AUXzH5xaUW7Ys/blW5XZTP181 aD1Ul2YXQtGDJwZzfZIjN/7kT9RnSJ4MQcenMiewVjzScitxyOA= =OUid -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

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

10 May '21

The annotated tag, v5.4.117 has been created at e256645d05e240bc91bc5ae17912d7956656976c (tag) tagging b5dbcd05792a4bad2c9bb3c4658c854e72c444b7 (commit) replaces v5.4.114 tagged by Greg Kroah-Hartman on Fri May 7 10:57:14 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 5.4.117 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCVAOoACgkQONu9yGCS aT7hHg//RSTMezyVHL3nU1cpPxTXE030uYYO6E6TGNIEmEfRijsJhZMQW/RPuqeX 4x3Beq7GtwnoDJTxR1FbeF8hFLSzqcyV0780Vknuk0bogM5tPL3HweysAzISbLWm bSDd76hQPTwOXOsgw1VDMwp9YLPYsZ5Bsnh9WuoIXwvBNUCu4pTS1bbs0Dd/vgGg OOf3aXr89Zrz79dvDq9KoE9gg2WVKhOTbK4jghJP2bgHI7hv7Enk87DPZSyHErDP v9SqgSNnREALL87K9UDdosJ5xDQloV0oJ/2AYsETPDKuIRWHo32R3VSAd8XtPrAz YP/Fmg08Q28onsoT+YUps44t1275mtUNFKPd6NHdyqGn+UHjxMG2EdWOR9cvL4Nh RF9B1jb2nq4olgeyt19CqwrYxcxuJOTPn/rUJcCLdyARIfzXOnHCSKJCkk5FSAU9 daU3HQlv5ukdrW7bl9QAVT6a7dJ9wZd9AB4WFghM68QZxHzylseF3ELTDLVcDN8O avGGOU6dc6MmO+7H6dr2s3cV9zBXCUoUD5mAzVzgz6h44Wpn+LK+ks6IWMnTNO9j ER94kMysUEcItguOEpJ1oe0b3Is+rmZsIBuRzneNlo1aGvhd3VCb+Zl9Wd92HwKi lvOwuha9GrLDkmUIaEbLQq9wdl3d6gcA6ldsnghParnrNEv319c= =iO7e -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

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

10 May '21

The annotated tag, v5.10.35 has been created at 387bbc0dbb1b51dc34baf346e2593773ddf66f4b (tag) tagging f53a3a4808625f876aebc5a0bfb354480bbf0c21 (commit) replaces v5.10.32 tagged by Greg Kroah-Hartman on Fri May 7 11:05:21 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 5.10.35 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCVAtEACgkQONu9yGCS aT4OYw/9EEMRHKqA/mIsFKpT069LryruswuTwGDgaOUeNkYrjbNJcf7g4OlddXHD ssZIqd2tO9RwFPQIGLxvCu8csTo7HPyzw2HoOUSdPQnFexBglGmNwaeXWhwroRUK weRzUNfj+1Bq5losPjceX1kiGyAOky1u0gU44z+b+8KBPGeFaK2FHmDMSMLZLRA7 knfQHZkN6TMQid76Vk3+HYJr6+++eJKruEBWR5HS9U3qFg1YGE/qrrG94OtCDuAF 9pqT/KpLBVFN0glwd2r5uYvqez+5kxg+Ch/WEX/fPz7bgKcPGCE4XuNU6mQg7Gxn +EwLMtX6U0hQh6tIg/APYvzSP5epNQb8Dj5BEaCm2koYBFFp/k3v/5vvj1jjcBkg W5JvqwdbNhJ11UaYo5KswciGzcs+tTtxdpoBX2JjcB++LkzL7hnOzWOC7fLC+OjB 5GYXYf0K6RBuYSphflJOh+Qkjoebep8YRImd6CyTAUF42/8GC2HUSJqPWmUL4Rlt E63i2C3vq0szuDrT2m3t6vtdUzL2ZADE58+tlAuWVL62le+aByEGO9N88I2MS5kB yEuU4SqbAgZChXNOy69DXLwHW3h9tRSpq5EnJBdFwAszo4PYQLCAgU7sb36nwf9B eLytE00SZ4jV+K4QCQ75flQ+nOBln6yw89dvcP0U5UZx1Zmbwxg= =pi6g -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

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

10 May '21

The annotated tag, v5.11.19 has been created at b56dabc61e0c002f4245672ce1fd599622f3623c (tag) tagging 44a3370d47be9adf7532431a6d69583bb350ee57 (commit) replaces v5.11.16 tagged by Greg Kroah-Hartman on Fri May 7 12:52:29 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 5.11.19 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCVG+0ACgkQONu9yGCS aT7vbg/+PMmwK0kK4zVCantJlq6HMgZaaN8sq0dppRfUnnySCeVbeAebq4le6RDW jL6jRCBkhtOC8F98nmUfYG5vZsSaXmCTaXRIvYu/oJqCmHiZRHtdwTZ74h1wskQz 1teZpbbcJ0tYirxN7OA8taH9VpiSgZmxY7vkWBZP7tdWKlbOin6svtCVFbqeGr3o LR/HKdOlN3Jin2xBVObP8VyrYrPe4Z/rPmUa4SpZoiPW5RGc5ozK7Dn/ZNVEY6wm vny+nJdPNR+szXAgcXxIiokj06IZB/oJ+PoORJoEmg36Wu1HjUswd1a1KSTlT3Do 9motugYf8AzUrWJxuK5SGZr/IrFhAjLR+lEax0AkWmEIfS3PD5fZUkv9wWF3/elk b+vzP3FewLtQhET2JW8+DXQDXy4+/myOdBR/NiP1Wbwn29y3RfCIVkhYDi97zUZv GQXpE3nEigEhdCTlE5qQMTIPQgd4av1eilWUyhup2SfAaHViOukYN1BTwtiZWUWs E/8qJh+yTAmW2UOX8rsUsnJvzdiGopn3L9zSJCqwzRPOTZ4Os3HNW+OwgG7CwKm5 kL+ZQAeTQAk+qIAktrAOPPs5z8+4WzQ/mzJ/qz8s1mROBEq2bM29QM8jEqz+gIKX P4eTuqYvEzCdDdjg+8fKJz5v85IB8Gy+PZtJcC3X0RziCY8qbE0= =0SZR -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

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

10 May '21

The annotated tag, v5.12.2 has been created at 203b79d722a7d2b949bc9d44cb6de7d6bed51fc5 (tag) tagging 96e86bea450b3a00af5dc7ba5382f1b241e4306a (commit) replaces v5.12 tagged by Greg Kroah-Hartman on Fri May 7 12:55:20 2021 +0200 - Shortlog ------------------------------------------------------------ This is the 5.12.2 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmCVHJgACgkQONu9yGCS aT7zoA/9HXCGWsjZkKCjYP0VKZ8h7C95Cl8yrhAw2jYTPYJPhqpw6zzRcP87tkIk HU+PTHZh9T3rRgqj1SVENSHH+afvjSoenjud6E7ima8LOImPj8ZIB8sSlP5sYQWN wkihcrlbushjghwQThYlh7WR/iFJHoYWujxbIf1jq56GZRkzbuHDdyRc0n5Z1IsM zxzp4RpfwzpTp/YRydaV7RfnLUQzFId3t2A0XhpyhsVsjv+1Ht77xxJxBAlNdQTV UQYbgky0jGXcK79UiXAdp7o9bGllc4fiyvREh8am5xYHkzPNRuMI4+ilcRWMvWCN DMLJYs32evYX4TumVI+W6FWmnHOCumXBNKbHYHlgFMVRHc8Fgnyhuwxw7V7yXTsO JA6TlfA4AEEnUXheJcMlHyTNeXBH/2TqE2aQv9qTB8wbM7yW3l+nfpqEFUcjGqWD w7zYBo8Pf44ufjCAHH/DNV2roJYNeqdIII4zMTZeZeARd1c26RVAsf4TnUnQMwHN cI8QRuyCJSCmO7ejsSpSGB9WUb24/rB+Fe/UKhdj7J3lyGb3apc8rM0dyXu/d1CM 4iF1+i/qYKPFisOXEhBamXW5rw3ssJQBSITTXdSWcW+IB+bob22X5VmPXSJ2+rSZ F7S8K4vjp6Mh7FbrU1mcAlA2ZBmkAsSLdyV209oJTpqa5RTF0OY= =th/v -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits