projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small fixes for Windows.
[tinc]
/
src
/
top.c
diff --git
a/src/top.c
b/src/top.c
index
62c46f5
..
b71bcb8
100644
(file)
--- a/
src/top.c
+++ b/
src/top.c
@@
-61,6
+61,10
@@
static bool changed = true;
static const char *unit = "bytes";
static float scale = 1;
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);
static void update(int fd) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
gettimeofday(&now, NULL);
@@
-108,7
+112,8
@@
static void update(int fd) {
} else {
found = xmalloc_and_zero(sizeof *found);
found->name = xstrdup(name);
} 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;
}
}
break;
}
}
@@
-117,6
+122,7
@@
static void update(int fd) {
found = xmalloc_and_zero(sizeof *found);
found->name = xstrdup(name);
list_insert_tail(&node_list, found);
found = xmalloc_and_zero(sizeof *found);
found->name = xstrdup(name);
list_insert_tail(&node_list, found);
+ changed = true;
}
found->known = true;
}
found->known = true;
@@
-134,7
+140,7
@@
static void update(int fd) {
static void redraw(void) {
erase();
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 %s OUT pkts OUT %s", unit, unit);
chgat(-1, A_REVERSE, 0, NULL);
attrset(A_REVERSE);
mvprintw(2, 0, "Node IN pkts IN %s OUT pkts OUT %s", unit, unit);
chgat(-1, A_REVERSE, 0, NULL);
@@
-219,10
+225,10
@@
static void redraw(void) {
attrset(A_DIM);
if(cumulative)
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
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);
}
node->name, node->in_packets_rate, node->in_bytes_rate * scale, node->out_packets_rate, node->out_bytes_rate * scale);
}