[2/5] batctl: follow the orig_interval move to /sys
Commit Message
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
batctl/main.c | 4 ++--
batctl/proc.c | 7 -------
batctl/proc.h | 2 --
batctl/sys.c | 7 +++++++
batctl/sys.h | 2 ++
5 files changed, 11 insertions(+), 11 deletions(-)
@@ -43,7 +43,7 @@ void print_usage(void) {
printf("commands:\n");
printf(" \tinterface|if [none|interface] \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(" \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");
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
} else if ((strcmp(argv[1], "interval") == 0) || (strcmp(argv[1], "it") == 0)) {
- ret = handle_proc_setting(argc - 1, argv + 1, PROC_ORIG_INTERVAL, orig_interval_usage);
+ ret = handle_sys_setting(argc - 1, argv + 1, SYS_ORIG_INTERVAL, orig_interval_usage);
} else if ((strcmp(argv[1], "vis_mode") == 0) || (strcmp(argv[1], "vm") == 0)) {
@@ -68,13 +68,6 @@ int interface(int argc, char **argv)
return EXIT_SUCCESS;
}
-void orig_interval_usage(void)
-{
- printf("Usage: batctl [options] interval \n");
- printf("options:\n");
- printf(" \t -h print this help\n");
-}
-
int handle_table(int argc, char **argv, char *file_path, void table_usage(void))
{
int optchar, read_opt = USE_BAT_HOSTS;
@@ -21,10 +21,8 @@
#define PROC_ROOT_PATH "/proc/net/batman-adv/"
#define PROC_INTERFACES "interfaces"
-#define PROC_ORIG_INTERVAL "orig_interval"
int interface(int argc, char **argv);
-void orig_interval_usage(void);
int handle_table(int argc, char **argv, char *file_path, void table_usage(void));
int handle_proc_setting(int argc, char **argv, char *file_path, void setting_usage(void));
@@ -207,6 +207,13 @@ void vis_mode_usage(void)
printf(" \t -h print this help\n");
}
+void orig_interval_usage(void)
+{
+ printf("Usage: batctl [options] interval \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))
{
int optchar, res;
@@ -33,6 +33,7 @@
#define SYS_GATEWAYS "gateways"
#define SYS_VIS_MODE "vis_mode"
#define SYS_VIS_DATA "vis_data"
+#define SYS_ORIG_INTERVAL "orig_interval"
void originators_usage(void);
void trans_local_usage(void);
@@ -42,6 +43,7 @@ void bonding_usage(void);
void gw_mode_usage(void);
void gateways_usage(void);
void vis_mode_usage(void);
+void orig_interval_usage(void);
int log_print(int argc, char **argv);
int handle_loglevel(int argc, char **argv);
int handle_sys_table(int argc, char **argv, char *file_path, void table_usage(void));