X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftop.c;h=b71bcb855cd9e817a46d02300a25ff391125207e;hb=532557beeaa60d96ac423248ff62d2cc03205c22;hp=4203e255c5da4cfe207620ba52ae2bfb7057a5ae;hpb=a8f0d21330b40993d52421327b1aa33a6ea7acb7;p=tinc

diff --git a/src/top.c b/src/top.c
index 4203e255..b71bcb85 100644
--- a/src/top.c
+++ b/src/top.c
@@ -58,6 +58,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 +112,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 +122,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 +140,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 +225,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 +282,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: