From patchwork Sun Oct 21 22:54:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17519 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 96D41830A1; Mon, 22 Oct 2018 00:56:24 +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="12qU420o"; 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 2234581834 for ; Mon, 22 Oct 2018 00:56:00 +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 A723A1100D5; Mon, 22 Oct 2018 00:55:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1540162559; bh=J0cHMe4s6JAaT5nIXj8S6jjmM5wmXvi3pZpMmKNpJ4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=12qU420oMD3SqLjPYFeu4u09oVK/igKJ9N0PWjzxdxn1eZq4U20InVwNAqtxXix4V VlnbelHZ5Lej5k3fKJ2LI3g02quZm7BNrY4pROFY6cedromP4sAnVYwJBoHEgRzlX1 6YoRAK7kyyh/CCOniQuWWaDH4bsI18EI3sLTgcdY= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 22 Oct 2018 00:54:54 +0200 Message-Id: <20181021225524.8155-9-sven@narfation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181021225524.8155-1-sven@narfation.org> References: <20181021225524.8155-1-sven@narfation.org> MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [PATCH 08/38] batctl: Rename tp_meter to throughputmeter 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 command itself is called throughputmeter but the file and function is called tp_meter. Use "throughputmeter" for both to make it easier to identify the correct source file. Signed-off-by: Sven Eckelmann --- Makefile | 2 +- main.c | 4 ++-- tp_meter.c => throughputmeter.c | 4 ++-- tp_meter.h => throughputmeter.h | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename tp_meter.c => throughputmeter.c (99%) rename tp_meter.h => throughputmeter.h (83%) diff --git a/Makefile b/Makefile index 9ff4fe4..b4777b7 100755 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ OBJ += routing_algo.o OBJ += statistics.o OBJ += sys.o OBJ += tcpdump.o -OBJ += tp_meter.o +OBJ += throughputmeter.o OBJ += traceroute.o OBJ += translate.o OBJ_BISECT = bisect_iv.o diff --git a/main.c b/main.c index 4abee13..34f5a62 100644 --- a/main.c +++ b/main.c @@ -35,7 +35,7 @@ #include "translate.h" #include "traceroute.h" #include "tcpdump.h" -#include "tp_meter.h" +#include "throughputmeter.h" #include "bisect_iv.h" #include "statistics.h" #include "loglevel.h" @@ -165,7 +165,7 @@ int main(int argc, char **argv) } else if ((strcmp(argv[1], "throughputmeter") == 0) || (strcmp(argv[1], "tp") == 0)) { - ret = tp_meter (mesh_iface, argc -1, argv + 1); + ret = throughputmeter(mesh_iface, argc -1, argv + 1); } else if ((strcmp(argv[1], "traceroute") == 0) || (strcmp(argv[1], "tr") == 0)) { diff --git a/tp_meter.c b/throughputmeter.c similarity index 99% rename from tp_meter.c rename to throughputmeter.c index c790485..bb53d56 100644 --- a/tp_meter.c +++ b/throughputmeter.c @@ -21,7 +21,7 @@ */ #include "main.h" -#include "tp_meter.h" +#include "throughputmeter.h" #include #include @@ -389,7 +389,7 @@ static void tp_meter_usage(void) fprintf(stderr, "\t -n don't convert addresses to bat-host names\n"); } -int tp_meter(char *mesh_iface, int argc, char **argv) +int throughputmeter(char *mesh_iface, int argc, char **argv) { struct bat_host *bat_host; uint64_t throughput; diff --git a/tp_meter.h b/throughputmeter.h similarity index 83% rename from tp_meter.h rename to throughputmeter.h index 72006ba..2c04c12 100644 --- a/tp_meter.h +++ b/throughputmeter.h @@ -20,9 +20,9 @@ * License-Filename: LICENSES/preferred/GPL-2.0 */ -#ifndef _BATCTL_TP_METER_H -#define _BATCTL_TP_METER_H +#ifndef _BATCTL_THROUGHPUTMETER_H +#define _BATCTL_THROUGHPUTMETER_H -int tp_meter(char *mesh_iface, int argc, char **argv); +int throughputmeter(char *mesh_iface, int argc, char **argv); -#endif /* _BATCTL_TP_METER_H */ +#endif /* _BATCTL_THROUGHPUTMETER_H */