From patchwork Sun Oct 21 23:02:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17550 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id D730D83085; Mon, 22 Oct 2018 01:02:39 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="N7bBK2oo"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 474D080B8D for ; Mon, 22 Oct 2018 01:02:38 +0200 (CEST) Received: from sven-desktop.home.narfation.org (p200300C593D704FD0000000000008096.dip0.t-ipconnect.de [IPv6:2003:c5:93d7:4fd::8096]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id CC1701100D5; Mon, 22 Oct 2018 01:02:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1540162957; bh=brXH/BgPnqxdvqBGfm4MiF0Dbk7sTJmZpuoC49zT+So=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N7bBK2oo6EFvxH+GBaCQKNpUJWfnyVEMvZ0srsc9aXdRGJRRq+DMk6vMr8gSjm1Sc Q42ly4FKJwGO0nlkw4gwrlzbUwtcQwI2PtGeW75fAXv4lWLmq3hxru9GM4QSg3ND3t MLilmeDSSrvQmosyhkYTBhkVwfVrOqgd7anQX3rw= From: Sven Eckelmann 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> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181021225524.8155-37-sven@narfation.org> References: <20181021225524.8155-37-sven@narfation.org> MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [PATCH v2 36/38] batctl: Move orig_interval setting to own file X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" 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 --- 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 --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 + * + * 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 + +#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");