X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftop.c;h=aafc2a4418702b134ce2d48b2d7c8861450baaf2;hb=1be7dc759a64d436fd7586aad43b545f2dc665b5;hp=bce5384e56afd196ff1c8cbdd7505272d095abb0;hpb=4f8abf1b29b117c5d593bfa7703966fd88e9eace;p=tinc diff --git a/src/top.c b/src/top.c index bce5384e..aafc2a44 100644 --- a/src/top.c +++ b/src/top.c @@ -25,6 +25,7 @@ #include "control_common.h" #include "list.h" +#include "names.h" #include "tincctl.h" #include "top.h" #include "xalloc.h" @@ -229,7 +230,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", @@ -264,53 +265,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;