[v5,19/20] batctl: Support generic netlink for network_coding command

Message ID 20190209134222.15035-20-sven@narfation.org
State Accepted, archived
Commit 77c34f719e6b6ffdfe79f4bed6456b5bcad21d7f
Delegated to: Simon Wunderlich
Headers show
Series
  • batctl: netlink restructuring, part 3
Related show

Commit Message

Sven Eckelmann Feb. 9, 2019, 1:42 p.m.
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 network_coding implementation is using the commands
BATADV_CMD_SET_MESH/BATADV_CMD_GET_MESH to set/get the configuration of
the u8 (boolean) BATADV_ATTR_NETWORK_CODING_ENABLED attribute.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
Cc: Martin Hundeboll <martin@hundeboll.net>
Cc: Marek Lindner <mareklindner@neomailbox.ch>
---
 network_coding.c | 46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

Patch

diff --git a/network_coding.c b/network_coding.c
index f4f184b..01d7515 100644
--- a/network_coding.c
+++ b/network_coding.c
@@ -21,13 +21,55 @@ 
  */
 
 #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 network_coding;
+
+static int print_network_coding(struct nl_msg *msg, void *arg)
+{
+	return sys_simple_print_boolean(msg, arg,
+					BATADV_ATTR_NETWORK_CODING_ENABLED);
+}
+
+static int get_network_coding(struct state *state)
+{
+	return sys_simple_nlquery(state, BATADV_CMD_GET_MESH,
+				  NULL, print_network_coding);
+}
+
+static int set_attrs_network_coding(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_NETWORK_CODING_ENABLED, data->val);
+
+	return 0;
+}
+
+static int set_network_coding(struct state *state)
+{
+	return sys_simple_nlquery(state, BATADV_CMD_SET_MESH,
+				  set_attrs_network_coding, NULL);
+}
+
 static struct settings_data batctl_settings_network_coding = {
 	.sysfs_name = "network_coding",
-	.params = sysfs_param_enable,
+	.data = &network_coding,
+	.parse = parse_simple_boolean,
+	.netlink_get = get_network_coding,
+	.netlink_set = set_network_coding,
 };
 
 COMMAND_NAMED(SUBCOMMAND, network_coding, "nc", handle_sys_setting,
-	      COMMAND_FLAG_MESH_IFACE, &batctl_settings_network_coding,
+	      COMMAND_FLAG_MESH_IFACE | COMMAND_FLAG_NETLINK,
+	      &batctl_settings_network_coding,
 	      "[0|1]             \tdisplay or modify network_coding setting");