sysfs should be avoided for new settings of network interfaces. To still
provide a common configuration infrastructure, all the existing settings
subcommands also have to be reimplemented via generic netlink while still
using sysfs as fallback.
The bonding implementation is using the commands
BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH to set/get the configuration of
the u8 (boolean) BATADV_ATTR_BONDING_ENABLED attribute.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Cc: Simon Wunderlich <sw@simonwunderlich.de>
---
bonding.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
@@ -21,13 +21,54 @@
*/
#include "main.h"
+
+#include <errno.h>
+#include <linux/genetlink.h>
+#include <netlink/genl/genl.h>
+
+#include "batman_adv.h"
+#include "netlink.h"
#include "sys.h"
+static struct simple_boolean_data bonding;
+
+static int print_bonding(struct nl_msg *msg, void *arg)
+{
+ return sys_simple_print_boolean(msg, arg, BATADV_ATTR_BONDING_ENABLED);
+}
+
+static int get_bonding(struct state *state)
+{
+ return sys_simple_nlquery(state, BATADV_CMD_GET_MESH,
+ NULL, print_bonding);
+}
+
+static int set_attrs_bonding(struct nl_msg *msg, void *arg)
+{
+ struct state *state = arg;
+ struct settings_data *settings = state->cmd->arg;
+ struct simple_boolean_data *data = settings->data;
+
+ nla_put_u8(msg, BATADV_ATTR_BONDING_ENABLED, data->val);
+
+ return 0;
+}
+
+static int set_bonding(struct state *state)
+{
+ return sys_simple_nlquery(state, BATADV_CMD_SET_MESH,
+ set_attrs_bonding, NULL);
+}
+
static struct settings_data batctl_settings_bonding = {
.sysfs_name = "bonding",
- .params = sysfs_param_enable,
+ .data = &bonding,
+ .parse = parse_simple_boolean,
+ .netlink_get = get_bonding,
+ .netlink_set = set_bonding,
};
COMMAND_NAMED(SUBCOMMAND, bonding, "b", handle_sys_setting,
- COMMAND_FLAG_MESH_IFACE, &batctl_settings_bonding,
+ COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK,
+ &batctl_settings_bonding,
"[0|1] \tdisplay or modify bonding setting");