From: Marek Lindner <lindner_marek@yahoo.de>
To: b.a.t.m.a.n@lists.open-mesh.net
Cc: Marek Lindner <lindner_marek@yahoo.de>
Subject: [B.A.T.M.A.N.] [PATCH 2/5] batctl: follow the orig_interval move to /sys
Date: Wed, 24 Mar 2010 12:52:40 +0800 [thread overview]
Message-ID: <1269406363-9593-2-git-send-email-lindner_marek@yahoo.de> (raw)
In-Reply-To: <201003241252.18954.lindner_marek@yahoo.de>
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(-)
diff --git a/batctl/main.c b/batctl/main.c
index a07e75b..da7fb4a 100644
--- a/batctl/main.c
+++ b/batctl/main.c
@@ -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)) {
diff --git a/batctl/proc.c b/batctl/proc.c
index 9f5c24f..192d4fb 100644
--- a/batctl/proc.c
+++ b/batctl/proc.c
@@ -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;
diff --git a/batctl/proc.h b/batctl/proc.h
index 0b5a6f2..61d6058 100644
--- a/batctl/proc.h
+++ b/batctl/proc.h
@@ -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));
diff --git a/batctl/sys.c b/batctl/sys.c
index 7d035d6..cd8979a 100644
--- a/batctl/sys.c
+++ b/batctl/sys.c
@@ -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;
diff --git a/batctl/sys.h b/batctl/sys.h
index 4f10cee..19d19f5 100644
--- a/batctl/sys.h
+++ b/batctl/sys.h
@@ -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));
--
1.7.0
next prev parent reply other threads:[~2010-03-24 4:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-24 4:52 [B.A.T.M.A.N.] reorganized kernel interface patches (version 3) Marek Lindner
2010-03-24 4:52 ` [B.A.T.M.A.N.] [PATCH 1/5] batman-adv: move originator interval setting from /proc to /sys Marek Lindner
2010-03-24 4:52 ` Marek Lindner [this message]
2010-03-24 4:52 ` [B.A.T.M.A.N.] [PATCH 3/5] batman-adv: remove redundant pointer to originator interface Marek Lindner
2010-03-24 4:52 ` [B.A.T.M.A.N.] [PATCH 4/5] batman-adv: move /proc interface handling to /sys Marek Lindner
2010-03-24 4:52 ` [B.A.T.M.A.N.] [PATCH 5/5] batctl: adapt batctl to new sysfs interface handling Marek Lindner
2010-04-01 17:28 ` [B.A.T.M.A.N.] reorganized kernel interface patches (version 3) Linus Lüssing
2010-04-03 9:44 ` Marek Lindner
2010-04-05 20:47 ` Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1269406363-9593-2-git-send-email-lindner_marek@yahoo.de \
--to=lindner_marek@yahoo.de \
--cc=b.a.t.m.a.n@lists.open-mesh.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).