X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftop.c;h=40b80479a95bce18367d0e5dc3cc771224268351;hp=bce5384e56afd196ff1c8cbdd7505272d095abb0;hb=abb24e9d71b3edb9cacf4c04361cc0dfd4e6a061;hpb=4f8abf1b29b117c5d593bfa7703966fd88e9eace

diff --git a/src/top.c b/src/top.c
index bce5384e..40b80479 100644
--- a/src/top.c
+++ b/src/top.c
@@ -1,6 +1,6 @@
 /*
     top.c -- Show real-time statistics from a running tincd
-    Copyright (C) 2011-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2011-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,10 +21,12 @@
 
 #ifdef HAVE_CURSES
 
+#undef KEY_EVENT  /* There are conflicting declarations for KEY_EVENT in Windows wincon.h and curses.h. */
 #include <curses.h>
 
 #include "control_common.h"
 #include "list.h"
+#include "names.h"
 #include "tincctl.h"
 #include "top.h"
 #include "xalloc.h"
@@ -65,12 +67,10 @@ static float bscale = 1;
 static const char *punit = "pkts";
 static float pscale = 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 bool update(int fd) {
+	if(!sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC))
+		return false;
 
-static void update(int fd) {
-	sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
 	gettimeofday(&cur, NULL);
 
 	timersub(&cur, &prev, &diff);
@@ -93,13 +93,10 @@ static void update(int fd) {
 		int n = sscanf(line, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, &code, &req, name, &in_packets, &in_bytes, &out_packets, &out_bytes);
 
 		if(n == 2)
-			break;
+			return true;
 
-		if(n != 7) {
-			endwin();
-			fprintf(stderr, "Error receiving traffic information\n");
-			exit(1);
-		}
+		if(n != 7)
+			return false;
 
 		nodestats_t *found = NULL;
 
@@ -111,7 +108,7 @@ static void update(int fd) {
 				found = ns;
 				break;
 			} else {
-				found = xmalloc_and_zero(sizeof *found);
+				found = xzalloc(sizeof *found);
 				found->name = xstrdup(name);
 				list_insert_before(&node_list, node, found);
 				changed = true;
@@ -120,7 +117,7 @@ static void update(int fd) {
 		}
 
 		if(!found) {
-			found = xmalloc_and_zero(sizeof *found);
+			found = xzalloc(sizeof *found);
 			found->name = xstrdup(name);
 			list_insert_tail(&node_list, found);
 			changed = true;
@@ -136,6 +133,8 @@ static void update(int fd) {
 		found->out_packets = out_packets;
 		found->out_bytes = out_bytes;
 	}
+
+	return false;
 }
 
 static int cmpfloat(float a, float b) {
@@ -216,7 +215,8 @@ static void redraw(void) {
 	for(int i = 0; i < n; i++)
 		sorted[i]->i = i;
 
-	qsort(sorted, n, sizeof *sorted, sortfunc);
+	if(sorted)
+		qsort(sorted, n, sizeof *sorted, sortfunc);
 
 	for(int i = 0, row = 3; i < n; i++, row++) {
 		nodestats_t *node = sorted[i];
@@ -229,7 +229,7 @@ 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.0f %10.0f %10.0f %10.0f",
 					node->name, node->in_packets * pscale, node->in_bytes * bscale, node->out_packets * pscale, node->out_bytes * bscale);
 		else
 			mvprintw(row, 0, "%-16s %10.0f %10.0f %10.0f %10.0f",
@@ -248,7 +248,9 @@ void top(int fd) {
 	bool running = true;
 
 	while(running) {
-		update(fd);
+		if(!update(fd))
+			break;
+
 		redraw();
 
 		switch(getch()) {
@@ -264,53 +266,53 @@ void top(int fd) {
 				break;
 			}
 			case 'c':
-				  cumulative = !cumulative;
-				  break;
+				cumulative = !cumulative;
+				break;
 			case 'n':
-				  sortmode = 0;
-				  break;
+				sortmode = 0;
+				break;
 			case 'i':
-				  sortmode = 2;
-				  break;
+				sortmode = 2;
+				break;
 			case 'I':
-				  sortmode = 1;
-				  break;
+				sortmode = 1;
+				break;
 			case 'o':
-				  sortmode = 4;
-				  break;
+				sortmode = 4;
+				break;
 			case 'O':
-				  sortmode = 3;
-				  break;
+				sortmode = 3;
+				break;
 			case 't':
-				  sortmode = 6;
-				  break;
+				sortmode = 6;
+				break;
 			case 'T':
-				  sortmode = 5;
-				  break;
+				sortmode = 5;
+				break;
 			case 'b':
-				  bunit = "bytes";
-				  bscale = 1;
-				  punit = "pkts";
-				  pscale = 1;
-				  break;
+				bunit = "bytes";
+				bscale = 1;
+				punit = "pkts";
+				pscale = 1;
+				break;
 			case 'k':
-				  bunit = "kbyte";
-				  bscale = 1e-3;
-				  punit = "pkts";
-				  pscale = 1;
-				  break;
+				bunit = "kbyte";
+				bscale = 1e-3;
+				punit = "pkts";
+				pscale = 1;
+				break;
 			case 'M':
-				  bunit = "Mbyte";
-				  bscale = 1e-6;
-				  punit = "kpkt";
-				  pscale = 1e-3;
-				  break;
+				bunit = "Mbyte";
+				bscale = 1e-6;
+				punit = "kpkt";
+				pscale = 1e-3;
+				break;
 			case 'G':
-				  bunit = "Gbyte";
-				  bscale = 1e-9;
-				  punit = "Mpkt";
-				  pscale = 1e-6;
-				  break;
+				bunit = "Gbyte";
+				bscale = 1e-9;
+				punit = "Mpkt";
+				pscale = 1e-6;
+				break;
 			case 'q':
 			case KEY_BREAK:
 				running = false;