iftop-users March 2014

iftop-users@domain

6 participants
4 discussions

[Iftop-users] [PATCH] Add colored output to iftop
by David Heidelberger 26 Mar '14

26 Mar '14

Add colored output to iftop. Based on https://github.com/srix/iftopcolor Signed-off-by: David Heidelberger <david.heidelberger(a)ixit.cz> --- diff -Naur a/ui.c b/ui.c --- a/ui.c 2014-01-08 14:00:48.776905827 +0100 +++ b/ui.c 2014-01-08 14:07:51.064903944 +0100 @@ -51,6 +51,9 @@ "\n"\ "iftop, version " IFTOP_VERSION +#define COLOR_SENT 1 +#define COLOR_RECV 2 +#define COLOR_BOTH 3 extern hash_type* history; extern int history_pos; @@ -199,12 +202,13 @@ } } -void draw_bar(float n, int y) { +void draw_bar(float n, int y, short colorpair) { int L; + colorpair = has_colors() ? colorpair : 0; /* set 0 if terminal is not color capable*/ mvchgat(y, 0, -1, A_NORMAL, 0, NULL); L = get_bar_length(8 * n); if (L > 0) - mvchgat(y, 0, L + 1, A_REVERSE, 0, NULL); + mvchgat(y, 0, L + 1, A_REVERSE, colorpair, NULL); } void draw_line_totals(int y, host_pair_line* line, option_linedisplay_t linedisplay) { @@ -219,17 +223,17 @@ if(options.showbars) { switch(linedisplay) { case OPTION_LINEDISPLAY_TWO_LINE: - draw_bar(line->sent[options.bar_interval],y); - draw_bar(line->recv[options.bar_interval],y+1); + draw_bar(line->sent[options.bar_interval],y, COLOR_SENT); + draw_bar(line->recv[options.bar_interval],y+1, COLOR_RECV); break; case OPTION_LINEDISPLAY_ONE_LINE_SENT: - draw_bar(line->sent[options.bar_interval],y); + draw_bar(line->sent[options.bar_interval],y,COLOR_SENT); break; case OPTION_LINEDISPLAY_ONE_LINE_RECV: - draw_bar(line->recv[options.bar_interval],y); + draw_bar(line->recv[options.bar_interval],y,COLOR_RECV); break; case OPTION_LINEDISPLAY_ONE_LINE_BOTH: - draw_bar(line->recv[options.bar_interval] + line->sent[options.bar_interval],y); + draw_bar(line->recv[options.bar_interval] + line->sent[options.bar_interval],y, COLOR_BOTH); break; } } @@ -428,6 +432,13 @@ void ui_curses_init() { (void) initscr(); /* initialize the curses library */ + if (has_colors()) { + start_color(); + use_default_colors(); + init_pair(COLOR_RECV, COLOR_GREEN, -1); + init_pair(COLOR_SENT, COLOR_BLUE, -1); + init_pair(COLOR_BOTH, COLOR_MAGENTA, -1); + } keypad(stdscr, TRUE); /* enable keyboard mapping */ (void) nonl(); /* tell curses not to do NL->CR/NL on output */ (void) cbreak(); /* take input chars one at a time, no wait for \n */

3 7

[Iftop-users] [PATCH] unlimited text output
by Roman Hoog Antink 17 Mar '14

17 Mar '14

Hi Paul Please consider this patch for 1.0pre5. It allows unlimited number of lines in text output, using "iftop -t -L 0". Thanks to Yan Chen for suggesting this tiny improvement. Cheers, Roman

1 0

[Iftop-users] Patches to fix some bugs with 10gbit cards
by Hans Fugal 07 Mar '14

07 Mar '14

[PATCH 1/3] Avoid 32-bit overflow for rates when calculating bar length Avoid 32-bit overflow by using double instead of int. uint64_t would be another option but these are only ever used in conjunction with floats. (float was also an option) --- ui.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui.c b/ui.c index 57ca6c0..8a3b9d0 100644 --- a/ui.c +++ b/ui.c @@ -71,7 +71,8 @@ int dontshowdisplay = 0; /* Barchart scales. */ static struct { - int max, interval; + double max; + int interval; } scale[] = { { 64000, 10 }, /* 64 kbit/s */ { 128000, 10 }, @@ -105,7 +106,7 @@ static float get_max_bandwidth() { } /* rate in bits */ -static int get_bar_length(const int rate) { +static int get_bar_length(const double rate) { float l; if (rate <= 0) return 0; [PATCH 2/3] scale[] up to tbit Extend the scale[] array up to terabit. 10gbit is not uncommon, 100gbit 40 and 100 gbit are coming, 400 gbit and terabit are future possibilities. --- ui.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ui.c b/ui.c index 8a3b9d0..d1500ad 100644 --- a/ui.c +++ b/ui.c @@ -74,13 +74,16 @@ static struct { double max; int interval; } scale[] = { - { 64000, 10 }, /* 64 kbit/s */ - { 128000, 10 }, - { 256000, 10 }, - { 1000000, 10 }, /* 1 Mbit/s */ - { 10000000, 10 }, - { 100000000, 100 }, - { 1000000000, 100 } /* 1 Gbit/s */ + { 64000, 10 }, /* 64 kbit/s */ + { 128000, 10 }, + { 256000, 10 }, + { 1000000, 10 }, /* 1 Mbit/s */ + { 10000000, 10 }, + { 100000000, 100 }, + { 1000000000, 100 }, /* 1 Gbit/s */ + { 10000000000, 100 }, + { 100000000000, 100 }, + { 1000000000000, 100 }, /* 1 Tbit/s */ }; static int rateidx = 0, wantbiggerrate; [PATCH 3/3] rateidx_init fix When calculating the first rateidx, we were overshooting to the next scale. Fix that. --- ui.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui.c b/ui.c index d1500ad..15624bf 100644 --- a/ui.c +++ b/ui.c @@ -116,7 +116,8 @@ static int get_bar_length(const double rate) { if (rate > scale[rateidx].max) { wantbiggerrate = 1; if(! rateidx_init) { - while(rate > scale[rateidx_init++].max) { + while(rate > scale[rateidx_init].max) { + rateidx_init++; } rateidx = rateidx_init; }

1 0

[Iftop-users] [PATCH] Display MAC Address in better format
by Xiaoguang Sun 03 Mar '14

03 Mar '14

Before this patch: root@57:~/iftop-1.0pre4# ./iftop interface: eth0 IP address is: 192.168.1.57 MAC address is: ffffffbc:ffffffee:7b:ffffffdb:0b:ffffffd4 With this patch root@57:~/iftop-1.0pre4# ./iftop interface: eth0 IP address is: 192.168.1.57 MAC address is: bc:ee:7b:db:0b:d4

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

iftop-users March 2014