/*
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
#include "control_common.h"
#include "list.h"
+#include "names.h"
#include "tincctl.h"
#include "top.h"
#include "xalloc.h"
static struct timeval cur, prev, diff;
static int delay = 1000;
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 const char *bunit = "bytes";
+static float bscale = 1;
+static const char *punit = "pkts";
+static float pscale = 1;
static void update(int fd) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
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;
}
if(!found) {
- found = xmalloc_and_zero(sizeof *found);
+ found = xzalloc(sizeof *found);
found->name = xstrdup(name);
list_insert_tail(&node_list, found);
changed = true;
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);
+ mvprintw(2, 0, "Node IN %s IN %s OUT %s OUT %s", punit, bunit, punit, bunit);
chgat(-1, A_REVERSE, 0, NULL);
static nodestats_t **sorted = 0;
attrset(A_DIM);
if(cumulative)
- 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);
+ 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",
- node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
+ node->name, node->in_packets_rate * pscale, node->in_bytes_rate * bscale, node->out_packets_rate * pscale, node->out_bytes_rate * bscale);
}
attrset(A_NORMAL);
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':
- unit = "bytes";
- scale = 1;
- break;
+ bunit = "bytes";
+ bscale = 1;
+ punit = "pkts";
+ pscale = 1;
+ break;
case 'k':
- unit = "kbyte";
- scale = 1e-3;
- break;
+ bunit = "kbyte";
+ bscale = 1e-3;
+ punit = "pkts";
+ pscale = 1;
+ break;
case 'M':
- unit = "Mbyte";
- scale = 1e-6;
- break;
+ bunit = "Mbyte";
+ bscale = 1e-6;
+ punit = "kpkt";
+ pscale = 1e-3;
+ break;
case 'G':
- unit = "Gbyte";
- scale = 1e-9;
- break;
+ bunit = "Gbyte";
+ bscale = 1e-9;
+ punit = "Mpkt";
+ pscale = 1e-6;
+ break;
case 'q':
case KEY_BREAK:
running = false;