src/ros.c: Storage sizes are now bytes, convert frequency back to MHz.

[routeros-api.git] / src / ros.c

diff --git a/src/ros.c b/src/ros.c
index 1849989..605c6b7 100644 (file)
--- a/src/ros.c
+++ b/src/ros.c
@@ -168,25 +168,27 @@ static int system_resource_handler (__attribute__((unused)) ros_connection_t *c,
        used_hdd_space = r->total_hdd_space - r->free_hdd_space;
 
        printf ("====== System resources ======\n"
+                       "Uptime:        %10.2f days\n"
                        "RouterOS version:  %11s\n"
                        "Architecture name: %11s\n"
                        "Board name:    %15s\n"
                        "CPU model:     %15s\n"
                        "CPU count:     %15u\n"
                        "CPU load:      %15u\n"
-                       "CPU frequency: %11"PRIu64" MHz\n"
-                       "Memory free:   %9"PRIu64" kByte (%4.1f %%)\n"
-                       "Memory used:   %9"PRIu64" kByte (%4.1f %%)\n"
-                       "Memory total:  %9"PRIu64" kByte\n"
-                       "Space free:    %9"PRIu64" kByte (%4.1f %%)\n"
-                       "Space used:    %9"PRIu64" kByte (%4.1f %%)\n"
-                       "Space total:   %9"PRIu64" kByte\n"
+                       "CPU frequency: %11g MHz\n"
+                       "Memory free:   %10"PRIu64" Byte (%4.1f %%)\n"
+                       "Memory used:   %10"PRIu64" Byte (%4.1f %%)\n"
+                       "Memory total:  %10"PRIu64" Byte\n"
+                       "Space free:    %10"PRIu64" Byte (%4.1f %%)\n"
+                       "Space used:    %10"PRIu64" Byte (%4.1f %%)\n"
+                       "Space total:   %10"PRIu64" Byte\n"
                        "Sectors written: %13"PRIu64" (%"PRIu64")\n"
                        "Bad blocks:    %15"PRIu64"\n"
                        "==============================\n",
-                       r->version,
+                       ((double) r->uptime) / 86400.0, r->version,
                        r->architecture_name, r->board_name,
-                       r->cpu_model, r->cpu_count, r->cpu_load, r->cpu_frequency,
+                       r->cpu_model, r->cpu_count, r->cpu_load,
+                       ((double) r->cpu_frequency) / 1000000.0,
                        r->free_memory,
                        100.0 * (((double) r->free_memory) / ((double) r->total_memory)),
                        used_memory,
@@ -271,7 +273,19 @@ static char *read_password (void) /* {{{ */
 
 static void exit_usage (void) /* {{{ */
 {
-       printf ("Usage: ros [options] <host> <command> [args]\n");
+       printf ("Usage: ros [options] <host> <command> [args]\n"
+                       "\n"
+                       "OPTIONS:\n"
+                       "  -u <user>       Use <user> to authenticate.\n"
+                       "  -h              Display this help message.\n"
+                       "\n");
+       if (ros_version () == ROS_VERSION)
+               printf ("Using librouteros %s\n", ROS_VERSION_STRING);
+       else
+               printf ("Using librouteros %s (%s)\n",
+                               ros_version_string (), ROS_VERSION_STRING);
+       printf ("Copyright (c) 2009 by Florian Forster\n");
+
        exit (EXIT_SUCCESS);
 } /* }}} void exit_usage */