Changeset 1560

Timestamp:

01/23/10 05:55:01 (8 months ago)

Author:

marek

Message:

batctl: make batch-mode the default and offer watch mode to deactivate it

Location:

trunk/batctl

Files:

• proc.c (modified) (6 diffs)
• sys.c (modified) (2 diffs)

trunk/batctl/proc.c

@@ -73 +73 @@
         printf("Usage: batctl [options] originators \n");
         printf("options:\n");
-        printf(" \t -b batch mode - read the originator table once and quit\n");
         printf(" \t -h print this help\n");
         printf(" \t -n don't replace mac addresses with bat-host names\n");
+        printf(" \t -w watch mode - refresh the originator table continuously\n");
 }
 
@@ -82 +82 @@
         printf("Usage: batctl [options] translocal \n");
         printf("options:\n");
-        printf(" \t -b batch mode - read the local translation table once and quit\n");
         printf(" \t -h print this help\n");
         printf(" \t -n don't replace mac addresses with bat-host names\n");
+        printf(" \t -w watch mode - refresh the local translation table continuously\n");
 }
 
@@ -91 +91 @@
         printf("Usage: batctl [options] transglobal \n");
         printf("options:\n");
-        printf(" \t -b batch mode - read the global translation table once and quit\n");
         printf(" \t -h print this help\n");
         printf(" \t -n don't replace mac addresses with bat-host names\n");
+        printf(" \t -w watch mode - refresh the global translation table continuously\n");
 }
 
@@ -100 +100 @@
         printf("Usage: batctl [options] gw_srv_list \n");
         printf("options:\n");
-        printf(" \t -b batch mode - read the gateway server list once and quit\n");
         printf(" \t -h print this help\n");
         printf(" \t -n don't replace mac addresses with bat-host names\n");
+        printf(" \t -w watch mode - refresh the gateway server list continuously\n");
 }
 
@@ -135 +135 @@
 int handle_table(int argc, char **argv, char *file_path, void table_usage(void))
 {
-        int optchar, read_opt = CLR_CONT_READ | USE_BAT_HOSTS;
+        int optchar, read_opt = USE_BAT_HOSTS;
 
-        while ((optchar = getopt(argc, argv, "bhn")) != -1) {
+        while ((optchar = getopt(argc, argv, "hnw")) != -1) {
                 switch (optchar) {
-                case 'b':
-                        read_opt &= ~CLR_CONT_READ;
-                        break;
                 case 'h':
                         table_usage();
@@ -147 +144 @@
                 case 'n':
                         read_opt &= ~USE_BAT_HOSTS;
+                        break;
+                case 'w':
+                        read_opt |= CLR_CONT_READ;
                         break;
                 default:

trunk/batctl/sys.c

@@ -37 +37 @@
         printf("Note: if no logfile was specified stdin is read");
         printf("options:\n");
-        printf(" \t -b batch mode - read the log file once and quit\n");
         printf(" \t -h print this help\n");
         printf(" \t -n don't replace mac addresses with bat-host names\n");
+        printf(" \t -w watch mode - read the log file continuously\n");
 }
 
 int log_print(int argc, char **argv)
 {
-        int optchar, read_opt = CONT_READ | USE_BAT_HOSTS | LOG_MODE;
+        int optchar, read_opt = USE_BAT_HOSTS | LOG_MODE;
         int found_args = 1;
 
-        while ((optchar = getopt(argc, argv, "bhn")) != -1) {
+        while ((optchar = getopt(argc, argv, "hnw")) != -1) {
                 switch (optchar) {
-                case 'b':
-                        read_opt &= ~CONT_READ;
-                        found_args += 1;
-                        break;
                 case 'h':
                         log_usage();
@@ -58 +54 @@
                 case 'n':
                         read_opt &= ~USE_BAT_HOSTS;
+                        found_args += 1;
+                        break;
+                case 'w':
+                        read_opt |= CONT_READ;
                         found_args += 1;
                         break;