diff mbox series

[v2,36/38] batctl: Move orig_interval setting to own file

Message ID	20181021230231.9118-1-sven@narfation.org (mailing list archive)
State	Superseded, archived
Delegated to:	Simon Wunderlich
Headers	Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=<UNKNOWN> From: Sven Eckelmann <sven@narfation.org> To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 22 Oct 2018 01:02:31 +0200 Message-Id: <20181021230231.9118-1-sven@narfation.org> In-Reply-To: <20181021225524.8155-37-sven@narfation.org> References: <20181021225524.8155-37-sven@narfation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [B.A.T.M.A.N.] [PATCH v2 36/38] batctl: Move orig_interval setting to own file Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" <b.a.t.m.a.n-bounces@lists.open-mesh.org>
Series	batctl: pre-netlink restructuring, part 1 \| [00/38] batctl: pre-netlink restructuring, part 1 [01/38] batctl: Drop unused define SOCKET_PATH_FMT [02/38] batctl: Use common code organization for statistics [03/38] batctl: Drop legacy vis_* related warning messages [04/38] batctl: Move loglevel command to separate file [05/38] batctl: Move log command to separate file [06/38] batctl: Move gw_mode command to separate file [07/38] batctl: Move routing_algo command to separate file [08/38] batctl: Rename tp_meter to throughputmeter [09/38] batctl: Introduce datastructure for subcommands [10/38] batctl: Add per command flags [11/38] batctl: Use command structure for remaining subcommands [12/38] batctl: Use getopt to parse main options [13/38] batctl: Store usage line next to command [14/38] batctl: Prepare command infrastructure for shared functions [15/38] batctl: Add type to command to structure usage output [16/38] batctl: Convert debug table to command infrastructure [17/38] batctl: Convert sysfs settings to command infrastructure [18/38] batctl: Move backbonetable debug table to own file [19/38] batctl: Move claimtable debug table to own file [20/38] batctl: Move dat_cache debug table to own file [21/38] batctl: Move gateways debug table to own file [22/38] batctl: Move mcast_flags debug table to own file [23/38] batctl: Move nc_nodes debug table to own file [24/38] batctl: Move neighbors debug table to own file [25/38] batctl: Move originators debug table to own file [26/38] batctl: Move transglobal debug table to own file [27/38] batctl: Move translocal debug table to own file [28/38] batctl: Move aggregation setting to own file [29/38] batctl: Move bonding setting to own file [30/38] batctl: Move bridge_loop_avoidance setting to own file [31/38] batctl: Move distributed_arp_table setting to own file [32/38] batctl: Move fragmentation setting to own file [33/38] batctl: Move isolation_mark setting to own file [34/38] batctl: Move multicast_mode setting to own file [35/38] batctl: Move network_coding setting to own file [37/38] batctl: Use external netlink socket for debug tables [38/38] batctl: Add command to monitor for netlink events [v2,36/38] batctl: Move orig_interval setting to own file

Commit Message

Sven Eckelmann Oct. 21, 2018, 11:02 p.m. UTC

  The sysfs settings are planned to get also be implemented in netlink. To
avoid cluttering up netlink.c again, it should be stored in a separate
file. This also allows to order the usage lines using the Makefile.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v2:
* Add missing orig_interval.c

 Makefile        |  1 +
 orig_interval.c | 35 +++++++++++++++++++++++++++++++++++
 sys.c           |  9 ---------
 3 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 orig_interval.c

diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 8582bf6..a6971d8 100755
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,7 @@  OBJ += netlink.o
 OBJ += network_coding.o
 OBJ += ping.o
 OBJ += originators.o
+OBJ += orig_interval.o
 OBJ += routing_algo.o
 OBJ += statistics.o
 OBJ += sys.o
diff --git a/orig_interval.c b/orig_interval.c
new file mode 100644
index 0000000..d308ea2
--- /dev/null
+++ b/orig_interval.c
@@ -0,0 +1,35 @@ 
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2009-2018  B.A.T.M.A.N. contributors:
+ *
+ * Marek Lindner <mareklindner@neomailbox.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
+ *
+ * License-Filename: LICENSES/preferred/GPL-2.0
+ */
+
+#include <stddef.h>
+
+#include "main.h"
+#include "sys.h"
+
+static struct settings_data batctl_settings_orig_interval = {
+	.sysfs_name = "orig_interval",
+	.params = NULL,
+};
+
+COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting,
+	      COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval,
+	      "[interval]        \tdisplay or modify orig_interval setting");
diff --git a/sys.c b/sys.c
index 932a7e8..6b98ac4 100644
--- a/sys.c
+++ b/sys.c
@@ -136,12 +136,3 @@  int handle_sys_setting(struct state *state, int argc, char **argv)
 	free(base_dev);
 	return res;
 }
-
-static struct settings_data batctl_settings_orig_interval = {
-	.sysfs_name = "orig_interval",
-	.params = NULL,
-};
-
-COMMAND_NAMED(SUBCOMMAND, orig_interval, "it", handle_sys_setting,
-	      COMMAND_FLAG_MESH_IFACE, &batctl_settings_orig_interval,
-	      "[interval]        \tdisplay or modify orig_interval setting");