batctl: interface bugfixes
cover batctl: interface bugfixes
I have now splitted the bugfixes for batctl in topic branches to make it a little bit easier to review. Similar to the "random bugfixes 2026-06-21" patchset, they are just various (mostly minor) problems which should be tackled at some point.
---
Sven Eckelmann (2):
batctl: interface: report rtnl query failures
batctl: interface: return fail for non-existing interface
interface.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
---
base-commit: eb9597d4ca6db17c579f5ae9443c51b013e2fe65
change-id: 20260704-bugfixes-interface-6eeb6cf77f4d
Best regards,
Signature · 1 line
Sven Eckelmann <[email protected]>
PATCH 1/2 batctl: interface: report rtnl query failures
print_interfaces() ignores the query_rtnl_link() result. When the rtnl socket setup or the dump request fails, batctl interface prints nothing and exits with EXIT_SUCCESS. This is indistinguishable from a meshif without any slave interfaces.
Check the result and fail with an error message instead.
--- interface.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
interface.c +8 -2
@@ -164,11 +164,17 @@ static int print_interfaces(struct state *state)if (ret <0 )return EXIT_FAILURE ; -query_rtnl_link (state->mesh_ifindex, print_interfaces_rtnl_parse, - state); + ret =query_rtnl_link (state->mesh_ifindex, print_interfaces_rtnl_parse, + state);netlink_destroy (state); +if (ret <0 ) { +fprintf (stderr,"Error - could not query interfaces: %s\n" , +strerror (-ret)); +return EXIT_FAILURE ; + } +return EXIT_SUCCESS ; }
Signature · 1 line
2.47.3
PATCH 2/2 batctl: interface: return fail for non-existing interface
In reply to Sven EckelmannThe add/del loop skips a non-existent interface name with a plain continue and returns a success when no other error class was detected. Which causes scripts (depending on the return value) to miss the problem.
Remember that a name could not be resolved and return EXIT_FAILURE at the end, while still processing the remaining interfaces.
--- interface.c | 5 +++++ 1 file changed, 5 insertions(+)
interface.c +5 -0
@@ -405,6 +405,7 @@ static int set_master_interface(const char *iface, unsigned int ifmaster)static int interface (struct state *state,int argc,char **argv) {struct interface_create_params create_params = {}; +bool iface_error = false;bool manual_mode = false;unsigned int ifmaster;unsigned int ifindex;
@@ -532,6 +533,7 @@ static int interface(struct state *state, int argc, char **argv)if (!ifindex) {fprintf (stderr,"Error - interface does not exist: %s\n" , rest_argv[i]); + iface_error = true;continue ; }
@@ -562,6 +564,9 @@ static int interface(struct state *state, int argc, char **argv) state->mesh_iface, state->mesh_iface); } +if (iface_error) +return EXIT_FAILURE ; +return EXIT_SUCCESS ; err:
Signature · 1 line
2.47.3