From patchwork Fri Dec 7 20:50:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17710 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 7A7F980E6C; Fri, 7 Dec 2018 21:50:28 +0100 (CET) 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="Ve1IjY3D"; 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 78D08803E6 for ; Fri, 7 Dec 2018 21:50:26 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C5970891FD0000000000008096.dip0.t-ipconnect.de [IPv6:2003:c5:9708:91fd::8096]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id BE6671100D6; Fri, 7 Dec 2018 21:50:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1544215826; bh=IsS84nxqrPiiPNsq2ECiG6zbj3K4id59Qp7TQeQskYM=; h=From:To:Cc:Subject:Date:From; b=Ve1IjY3DKYhjAbjkmRjAqW3J/ym+M5px8tqp30YVUfPWLA2iBcu5lcd3VsUFnx28p goMahXk22ywi3gFGP7qIclWbbmrqHTANRignfZIB41Fi7QTn6NIe0uicdD8/29ASHd FyLMq66mOQt1qdY3HYVpkg32wZtAx9FPSCd8rM2I= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 7 Dec 2018 21:50:13 +0100 Message-Id: <20181207205013.25105-1-sven@narfation.org> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [PATCH] batctl: Rename option_watch_interval to option_timeout_interval 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 watch interval is actually a different option for debug tables which uses the parameter '-w'. The configuration to enable/disable the parameter to set the timeout for not displaying not seen originators should therefore use a different name. Signed-off-by: Sven Eckelmann --- debug.c | 4 ++-- debug.h | 2 +- originators.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debug.c b/debug.c index 316312f..182877a 100644 --- a/debug.c +++ b/debug.c @@ -44,7 +44,7 @@ static void debug_table_usage(struct state *state) fprintf(stderr, " \t -H don't show the header\n"); fprintf(stderr, " \t -w [interval] watch mode - refresh the table continuously\n"); - if (debug_table->option_watch_interval) + if (debug_table->option_timeout_interval) fprintf(stderr, " \t -t timeout interval - don't print originators not seen for x.y seconds \n"); if (debug_table->option_orig_iface) @@ -89,7 +89,7 @@ int handle_debug_table(struct state *state, int argc, char **argv) } break; case 't': - if (!debug_table->option_watch_interval) { + if (!debug_table->option_timeout_interval) { fprintf(stderr, "Error - unrecognised option '-%c'\n", optchar); debug_table_usage(state); return EXIT_FAILURE; diff --git a/debug.h b/debug.h index 2dac1b7..f1a3fd4 100644 --- a/debug.h +++ b/debug.h @@ -43,7 +43,7 @@ struct debug_table_data { float orig_timeout, float watch_interval); unsigned int option_unicast_only:1; unsigned int option_multicast_only:1; - unsigned int option_watch_interval:1; + unsigned int option_timeout_interval:1; unsigned int option_orig_iface:1; }; diff --git a/originators.c b/originators.c index c29300a..7dc9b4c 100644 --- a/originators.c +++ b/originators.c @@ -219,7 +219,7 @@ static struct debug_table_data batctl_debug_table_originators = { .debugfs_name = "originators", .header_lines = 2, .netlink_fn = netlink_print_originators, - .option_watch_interval = 1, + .option_timeout_interval = 1, .option_orig_iface = 1, };