X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftop.c;h=b050435da2813b76b3f598d8a5b49f727aec69c0;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=dc1fecf30d9eb7521fbe9ff5398c6b7362443063;hpb=80ca91769d48e546d3e4cde03c2eb2820c03acc4;p=tinc

diff --git a/src/top.c b/src/top.c
index dc1fecf3..b050435d 100644
--- 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"
@@ -29,6 +31,7 @@
 
 typedef struct nodestats_t {
 	char *name;
+	int i;
 	uint64_t in_packets;
 	uint64_t in_bytes;
 	uint64_t out_packets;
@@ -56,11 +59,14 @@ static bool cumulative = false;
 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);
 	gettimeofday(&now, NULL);
@@ -78,10 +84,8 @@ static void update(int fd) {
 	uint64_t out_packets;
 	uint64_t out_bytes;
 
-	for(list_node_t *i = node_list.head; i; i = i->next) {
-		nodestats_t *node = i->data;
-		node->known = false;
-	}
+	for list_each(nodestats_t, ns, &node_list)
+		ns->known = false;
 
 	while(recvline(fd, line, sizeof line)) {
 		int n = sscanf(line, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, &code, &req, name, &in_packets, &in_bytes, &out_packets, &out_bytes);
@@ -97,19 +101,17 @@ static void update(int fd) {
 
 		nodestats_t *found = NULL;
 
-		for(list_node_t *i = node_list.head; i; i = i->next) {
-			nodestats_t *node = i->data;
-			int result = strcmp(name, node->name);
+		for list_each(nodestats_t, ns, &node_list) {
+			int result = strcmp(name, ns->name);
 			if(result > 0) {
 				continue;
 			} if(result == 0) {
-				found = node;
+				found = ns;
 				break;
 			} else {
 				found = xmalloc_and_zero(sizeof *found);
 				found->name = xstrdup(name);
-				fprintf(stderr, "Inserting %s before %s\n", found->name, node->name);
-				list_insert_before(&node_list, i, found);
+				list_insert_before(&node_list, node, found);
 				changed = true;
 				break;
 			}
@@ -137,7 +139,7 @@ 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: %-10s  %s", netname ?: "", node_list.count, sortname[sortmode], cumulative ? "Cumulative" : "Current");
 	attrset(A_REVERSE);
 	mvprintw(2, 0, "Node                IN pkts   IN %s   OUT pkts  OUT %s", unit, unit);
 	chgat(-1, A_REVERSE, 0, NULL);
@@ -147,11 +149,14 @@ static void redraw(void) {
 	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;
+		for list_each(nodestats_t, ns, &node_list)
+			sorted[n++] = ns;
 		changed = false;
 	}
-	
+
+	for(int i = 0; i < n; i++)
+		sorted[i]->i = i;
+
 	int cmpfloat(float a, float b) {
 		if(a < b)
 			return -1;
@@ -176,36 +181,36 @@ static void redraw(void) {
 		switch(sortmode) {
 			case 1:
 				if(cumulative)
-					return -cmpu64(na->in_packets, nb->in_packets);
+					return -cmpu64(na->in_packets, nb->in_packets) ?: na->i - nb->i;
 				else
-					return -cmpfloat(na->in_packets_rate, nb->in_packets_rate);
+					return -cmpfloat(na->in_packets_rate, nb->in_packets_rate) ?: na->i - nb->i;
 			case 2:
 				if(cumulative)
-					return -cmpu64(na->in_bytes, nb->in_bytes);
+					return -cmpu64(na->in_bytes, nb->in_bytes) ?: na->i - nb->i;
 				else
-					return -cmpfloat(na->in_bytes_rate, nb->in_bytes_rate);
+					return -cmpfloat(na->in_bytes_rate, nb->in_bytes_rate) ?: na->i - nb->i;
 			case 3:
 				if(cumulative)
-					return -cmpu64(na->out_packets, nb->out_packets);
+					return -cmpu64(na->out_packets, nb->out_packets) ?: na->i - nb->i;
 				else
-					return -cmpfloat(na->out_packets_rate, nb->out_packets_rate);
+					return -cmpfloat(na->out_packets_rate, nb->out_packets_rate) ?: na->i - nb->i;
 			case 4:
 				if(cumulative)
-					return -cmpu64(na->out_bytes, nb->out_bytes);
+					return -cmpu64(na->out_bytes, nb->out_bytes) ?: na->i - nb->i;
 				else
-					return -cmpfloat(na->out_bytes_rate, nb->out_bytes_rate);
+					return -cmpfloat(na->out_bytes_rate, nb->out_bytes_rate) ?: na->i - nb->i;
 			case 5:
 				if(cumulative)
-					return -cmpu64(na->in_packets + na->out_packets, nb->in_packets + nb->out_packets);
+					return -cmpu64(na->in_packets + na->out_packets, nb->in_packets + nb->out_packets) ?: na->i - nb->i;
 				else
-					return -cmpfloat(na->in_packets_rate + na->out_packets_rate, nb->in_packets_rate + nb->out_packets_rate);
+					return -cmpfloat(na->in_packets_rate + na->out_packets_rate, nb->in_packets_rate + nb->out_packets_rate) ?: na->i - nb->i;
 			case 6:
 				if(cumulative)
-					return -cmpu64(na->in_bytes + na->out_bytes, nb->in_bytes + nb->out_bytes);
+					return -cmpu64(na->in_bytes + na->out_bytes, nb->in_bytes + nb->out_bytes) ?: na->i - nb->i;
 				else
-					return -cmpfloat(na->in_bytes_rate + na->out_bytes_rate, nb->in_bytes_rate + nb->out_bytes_rate);
+					return -cmpfloat(na->in_bytes_rate + na->out_bytes_rate, nb->in_bytes_rate + nb->out_bytes_rate) ?: na->i - nb->i;
 			default:
-				return strcmp(na->name, nb->name);
+				return strcmp(na->name, nb->name) ?: na->i - nb->i;
 		}
 	}
 
@@ -222,10 +227,10 @@ static void redraw(void) {
 			attrset(A_DIM);
 
 		if(cumulative)
-			mvprintw(row, 0, "%-16s %'10"PRIu64" %'10.0f %'10"PRIu64" %'10.0f",
+			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",
+			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);
 	}
 
@@ -238,6 +243,7 @@ static void redraw(void) {
 void top(int fd) {
 	initscr();
 	timeout(delay);
+	bool running = true;
 
 	while(running) {
 		update(fd);
@@ -296,7 +302,6 @@ void top(int fd) {
 				  scale = 1e-9;
 				  break;
 			case 'q':
-			case 27:
 			case KEY_BREAK:
 				running = false;
 				break;
@@ -307,3 +312,5 @@ void top(int fd) {
 
 	endwin();
 }
+
+#endif