X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftop.c;h=b71bcb855cd9e817a46d02300a25ff391125207e;hb=5f4d57e846b566e80557c57a72e2bad562f66e7b;hp=5ca97495ff0c5eef4587eee04d669e68af980810;hpb=d772289f6d6adfb8932658b533349d43f08ec326;p=tinc

diff --git a/src/top.c b/src/top.c
index 5ca97495..b71bcb85 100644
--- a/src/top.c
+++ b/src/top.c
@@ -57,6 +57,13 @@ static list_t node_list;
 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);
@@ -105,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;
 			}
 		}
@@ -114,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;
@@ -128,18 +137,23 @@ static void update(int fd) {
 	}
 }
 
-static void redraw() {
+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);
 
-	nodestats_t *sorted[node_list.count];
-	int n = 0;
-	for(list_node_t *i = node_list.head; i; i = i->next)
-		sorted[n++] = i->data;
+	static nodestats_t **sorted = 0;
+	static int n = 0;
+	if(changed) {
+		n = 0;
+		sorted = xrealloc(sorted, node_list.count * sizeof *sorted);
+		for(list_node_t *i = node_list.head; i; i = i->next)
+			sorted[n++] = i->data;
+		changed = false;
+	}
 	
 	int cmpfloat(float a, float b) {
 		if(a < b)
@@ -200,8 +214,7 @@ static void redraw() {
 
 	qsort(sorted, n, sizeof *sorted, sortfunc);
 
-	int row = 3;
-	for(int i = 0; i < n; i++, row++) {
+	for(int i = 0, row = 3; i < n; i++, row++) {
 		nodestats_t *node = sorted[i];
 		if(node->known)
 			if(node->in_packets_rate || node->out_packets_rate)
@@ -212,11 +225,11 @@ static void redraw() {
 			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);
@@ -237,7 +250,7 @@ void top(int fd) {
 			case 's': {
 				timeout(-1);
 				float input = delay * 1e-3;
-				printw("Change delay from %.1fs to: ", input);
+				mvprintw(1, 0, "Change delay from %.1fs to: ", input);
 				scanw("%f", &input);
 				if(input < 0.1)
 					input = 0.1;
@@ -269,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: