Author: marek Date: 2010-07-11 16:34:10 +0200 (Sun, 11 Jul 2010) New Revision: 1736
Modified: trunk/batctl/main.c trunk/batctl/sys.c trunk/batctl/sys.h Log: batctl: layer2 unicast packet fragmentation
This patch add options to enable/disable fragmentation
Signed-off-by: Andreas Langer <an.langer at gmx.de>
Modified: trunk/batctl/main.c =================================================================== --- trunk/batctl/main.c 2010-07-11 14:34:09 UTC (rev 1735) +++ trunk/batctl/main.c 2010-07-11 14:34:10 UTC (rev 1736) @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * - * Andreas Langer a.langer@q-dsl.de, Marek Lindner lindner_marek@yahoo.de + * Andreas Langer an.langer@gmx.de, Marek Lindner lindner_marek@yahoo.de * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -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(" \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(" \tlog|l \tread the log produced by the kernel module\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(" \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(" \tlog|l \tread the log produced by the kernel module\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(" \tfragmentation|f [0|1] \tdisplay or modify the fragmentation mode setting\n"); printf("\n"); - printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); - printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); - printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); - printf(" \tbisect <file1> .. <fileN>\tanalyze given log files for routing stability\n"); + printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); + printf(" \ttraceroute|tr <destination> \ttraceroute another batman adv host via layer 2\n"); + printf(" \ttcpdump|td <interface> \ttcpdump layer 2 traffic on the given interface\n"); + printf(" \tbisect <file1> .. <fileN>\tanalyze given log files for routing stability\n"); printf("options:\n"); printf(" \t-h print this help (or 'batctl <command> -h' for the command specific help)\n"); printf(" \t-v print version\n"); @@ -149,6 +150,10 @@
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);
Modified: trunk/batctl/sys.c =================================================================== --- trunk/batctl/sys.c 2010-07-11 14:34:09 UTC (rev 1735) +++ trunk/batctl/sys.c 2010-07-11 14:34:10 UTC (rev 1736) @@ -252,6 +252,13 @@ 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[])
Modified: trunk/batctl/sys.h =================================================================== --- trunk/batctl/sys.h 2010-07-11 14:34:09 UTC (rev 1735) +++ trunk/batctl/sys.h 2010-07-11 14:34:10 UTC (rev 1736) @@ -31,12 +31,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);