From patchwork Sun Jun 27 15:27:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Langer X-Patchwork-Id: 271 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id AC99C1544E7 for ; Sun, 27 Jun 2010 17:27:40 +0200 (CEST) Received: (qmail invoked by alias); 27 Jun 2010 15:27:39 -0000 Received: from 91-67-51-126-dynip.superkabel.de (EHLO rechenknecht) [91.67.51.126] by mail.gmx.net (mp055) with SMTP; 27 Jun 2010 17:27:39 +0200 X-Authenticated: #9260637 X-Provags-ID: V01U2FsdGVkX19cd5NwBnNcnwD9Csj7etZy/hzpaZcm4tbqfTX6rG c+YSSk1r5yqtxw Date: Sun, 27 Jun 2010 17:27:33 +0200 From: Andreas Langer To: b.a.t.m.a.n@lists.open-mesh.org Message-ID: <20100627172733.161fb037@rechenknecht> X-Mailer: Claws Mail 3.7.4 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 X-Y-GMX-Trusted: 0 Subject: [B.A.T.M.A.N.] PATCH batctl fragmentation handling X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jun 2010 15:27:40 -0000 Added options to enable/disable fragmentation Signed-off-by: Andreas Langer --- batctl/main.c | 29 +++++++++++++++++------------ batctl/sys.c | 7 +++++++ batctl/sys.h | 2 ++ 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/batctl/main.c b/batctl/main.c index 0506dce..e2d8545 100644 --- a/batctl/main.c +++ b/batctl/main.c @@ -41,24 +41,25 @@ void print_usage(void) { printf("Usage: batctl [options] commands \n"); printf("commands:\n"); - printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); + printf(" \tinterface|if [add|del iface(s)]\tdisplay or modify the interface settings\n"); printf(" \toriginators|o \tdisplay the originator table\n"); - printf(" \tinterval|it [orig_interval] \tdisplay or modify the originator interval (in ms)\n"); - printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); + printf(" \tinterval|it [orig_interval] \tdisplay or modify the originator interval (in ms)\n"); + printf(" \tloglevel|ll [level] \tdisplay or modify the log level\n"); printf(" \tlog|l \tread the log produced by the kernel module\n"); - printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); + printf(" \tgw_mode|gw [mode] \tdisplay or modify the gateway mode\n"); printf(" \tgateways|gwl \tdisplay the gateway server list\n"); printf(" \ttranslocal|tl \tdisplay the local translation table\n"); printf(" \ttransglobal|tg \tdisplay the global translation table\n"); - printf(" \tvis_mode|vm [mode] \tdisplay or modify the status of the VIS server\n"); - printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); - printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); - printf(" \tbonding|b [0|1] \tdisplay or modify the bonding mode setting\n"); + printf(" \tvis_mode|vm [mode] \tdisplay or modify the status of the VIS server\n"); + printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); + printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); + printf(" \tbonding|b [0|1] \tdisplay or modify the bonding mode setting\n"); + printf(" \tfragmentation|f [0|1] \tdisplay or modify the fragmentation mode setting\n"); printf("\n"); - printf(" \tping|p \tping another batman adv host via layer 2\n"); - printf(" \ttraceroute|tr \ttraceroute another batman adv host via layer 2\n"); - printf(" \ttcpdump|td \ttcpdump layer 2 traffic on the given interface\n"); - printf(" \tbisect .. \tanalyze given log files for routing stability\n"); + printf(" \tping|p \tping another batman adv host via layer 2\n"); + printf(" \ttraceroute|tr \ttraceroute another batman adv host via layer 2\n"); + printf(" \ttcpdump|td \ttcpdump layer 2 traffic on the given interface\n"); + printf(" \tbisect .. \tanalyze given log files for routing stability\n"); printf("options:\n"); printf(" \t-h print this help (or 'batctl -h' for the command specific help)\n"); printf(" \t-v print version\n"); @@ -149,6 +150,10 @@ int main(int argc, char **argv) ret = handle_sys_setting(argc - 1, argv + 1, SYS_BONDING, bonding_usage, sysfs_param_enable); + } else if ((strcmp(argv[1], "fragmentation") == 0) || (strcmp(argv[1], "f") == 0)) { + + ret = handle_sys_setting(argc - 1, argv + 1, SYS_FRAG, fragmentation_usage, sysfs_param_enable); + } else if ((strcmp(argv[1], "bisect") == 0)) { ret = bisect(argc - 1, argv + 1); diff --git a/batctl/sys.c b/batctl/sys.c index 9137424..c928dd4 100644 --- a/batctl/sys.c +++ b/batctl/sys.c @@ -292,6 +292,13 @@ void orig_interval_usage(void) printf(" \t -h print this help\n"); } +void fragmentation_usage(void) +{ + printf("Usage: batctl [options] fragmentation [0|1]\n"); + printf("options:\n"); + printf(" \t -h print this help\n"); +} + int handle_sys_setting(int argc, char **argv, char *file_path, void setting_usage(void), const char *sysfs_param[]) diff --git a/batctl/sys.h b/batctl/sys.h index 3bbe030..fc10851 100644 --- a/batctl/sys.h +++ b/batctl/sys.h @@ -32,12 +32,14 @@ #define SYS_IFACE_PATH "/sys/class/net" #define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface" #define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" +#define SYS_FRAG "fragmentation" extern const char *sysfs_param_enable[]; extern const char *sysfs_param_server[]; void aggregation_usage(void); void bonding_usage(void); +void fragmentation_usage(void); void gw_mode_usage(void); void vis_mode_usage(void); void orig_interval_usage(void);