Don't use AM_CONDITIONAL for CURSES.

[meshlink] / src / top.c

diff --git a/src/top.c b/src/top.c
index 4203e255c5da4cfe207620ba52ae2bfb7057a5ae..a457e0803c9b12c2cbb8c39a300aa70e2e30fc2c 100644 (file)
--- a/src/top.c
+++ b/src/top.c
@@ -19,6 +19,8 @@
 
 #include "system.h"
 
+#ifdef HAVE_CURSES
+
 #include <curses.h>
 
 #include "control_common.h"
@@ -58,6 +60,12 @@ static struct timeval now, prev, diff;
 static int delay = 1000;
 static bool running = true;
 static bool changed = true;
+static const char *unit = "bytes";
+static float scale = 1;
+
+#ifndef timersub
+#define timersub(a, b, c) do {(c)->tv_sec = (a)->tv_sec - (b)->tv_sec; (c)->tv_usec = (a)->tv_usec = (b)->tv_usec;} while(0)
+#endif
 
 static void update(int fd) {
        sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
@@ -106,7 +114,8 @@ static void update(int fd) {
                        } else {
                                found = xmalloc_and_zero(sizeof *found);
                                found->name = xstrdup(name);
-                               list_insert_after(&node_list, i, found);
+                               list_insert_before(&node_list, i, found);
+                               changed = true;
                                break;
                        }
                }
@@ -115,6 +124,7 @@ static void update(int fd) {
                        found = xmalloc_and_zero(sizeof *found);
                        found->name = xstrdup(name);
                        list_insert_tail(&node_list, found);
+                       changed = true;
                }
 
                found->known = true;
@@ -132,9 +142,9 @@ static void update(int fd) {
 static void redraw(void) {
        erase();
 
-       mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname, node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
+       mvprintw(0, 0, "Tinc %-16s  Nodes: %4d  Sort: %-8s  %s", netname ?: "", node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
        attrset(A_REVERSE);
-       mvprintw(2, 0, "Node                IN pkts   IN bytes   OUT pkts  OUT bytes");
+       mvprintw(2, 0, "Node                IN pkts   IN %s   OUT pkts  OUT %s", unit, unit);
        chgat(-1, A_REVERSE, 0, NULL);
 
        static nodestats_t **sorted = 0;
@@ -217,11 +227,11 @@ static void redraw(void) {
                        attrset(A_DIM);
 
                if(cumulative)
-                       mvprintw(row, 0, "%-16s %'10"PRIu64" %'10"PRIu64" %'10"PRIu64" %'10"PRIu64,
-                                       node->name, node->in_packets, node->in_bytes, node->out_packets, node->out_bytes);
+                       mvprintw(row, 0, "%-16s %10"PRIu64" %10.0f %10"PRIu64" %10.0f",
+                                       node->name, node->in_packets, node->in_bytes * scale, node->out_packets, node->out_bytes * scale);
                else
-                       mvprintw(row, 0, "%-16s %'10.0f %'10.0f %'10.0f %'10.0f",
-                                       node->name, node->in_packets_rate, node->in_bytes_rate, node->out_packets_rate, node->out_bytes_rate);
+                       mvprintw(row, 0, "%-16s %10.0f %10.0f %10.0f %10.0f",
+                                       node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
        }
 
        attrset(A_NORMAL);
@@ -274,6 +284,22 @@ void top(int fd) {
                        case 'T':
                                  sortmode = 5;
                                  break;
+                       case 'b':
+                                 unit = "bytes";
+                                 scale = 1;
+                                 break;
+                       case 'k':
+                                 unit = "kbyte";
+                                 scale = 1e-3;
+                                 break;
+                       case 'M':
+                                 unit = "Mbyte";
+                                 scale = 1e-6;
+                                 break;
+                       case 'G':
+                                 unit = "Gbyte";
+                                 scale = 1e-9;
+                                 break;
                        case 'q':
                        case 27:
                        case KEY_BREAK:
@@ -286,3 +312,5 @@ void top(int fd) {
 
        endwin();
 }
+
+#endif