j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Small fixes for Windows.

Browse source
This commit is contained in:
Guus Sliepen 2011-06-02 23:40:27 +02:00
parent 2adc789401
commit 5f4d57e846
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tincd.c
View file

@ -64,7 +64,7 @@
#include "xalloc.h" #include "xalloc.h"
/* The name this program was run with. */ /* The name this program was run with. */
static char *program_name = NULL; char *program_name = NULL;
/* If nonzero, display usage information and exit. */ /* If nonzero, display usage information and exit. */
static bool show_help = false; static bool show_help = false;

10
src/top.c
View file

@ -61,6 +61,10 @@ static bool changed = true;
static const char *unit = "bytes"; static const char *unit = "bytes";
static float scale = 1; 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) { static void update(int fd) {
sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC); sendline(fd, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
@ -136,7 +140,7 @@ static void update(int fd) {
static void redraw(void) { static void redraw(void) {
erase(); 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); attrset(A_REVERSE);
mvprintw(2, 0, "Node IN pkts IN %s OUT pkts OUT %s", unit, unit); mvprintw(2, 0, "Node IN pkts IN %s OUT pkts OUT %s", unit, unit);
chgat(-1, A_REVERSE, 0, NULL); chgat(-1, A_REVERSE, 0, NULL);
@ -221,10 +225,10 @@ static void redraw(void) {
attrset(A_DIM); attrset(A_DIM);
if(cumulative) 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); node->name, node->in_packets, node->in_bytes * scale, node->out_packets, node->out_bytes * scale);
else 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);
} }