#include "system.h"
+#ifdef HAVE_CURSES
+
#include <curses.h>
#include "control_common.h"
typedef struct nodestats_t {
char *name;
+ int i;
uint64_t in_packets;
uint64_t in_bytes;
uint64_t out_packets;
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);
} 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;
}
}
found = xmalloc_and_zero(sizeof *found);
found->name = xstrdup(name);
list_insert_tail(&node_list, found);
+ changed = true;
}
found->known = true;
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 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;
+ }
+
+ for(int i = 0; i < n; i++)
+ sorted[i]->i = i;
int cmpfloat(float a, float b) {
if(a < b)
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;
}
}
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)
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);
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:
running = false;
break;
endwin();
}
+
+#endif
projects / tinc / blobdiff