mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed sort behaviour to be based on what is displayed when displaying only

Browse Source 
to/from traffic.

Damián Viano <des@debian.org>
This commit is contained in:
pdw
2010-11-27 11:14:43 +00:00
parent 6197223f52
commit e533714b78
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ui.c
View File

@@ -97,10 +97,30 @@ int dontshowdisplay = 0;
*/ */
int screen_line_bandwidth_compare(host_pair_line* aa, host_pair_line* bb, int start_div) { int screen_line_bandwidth_compare(host_pair_line* aa, host_pair_line* bb, int start_div) {
int i; int i;
for(i = start_div; i < HISTORY_DIVISIONS; i++) { switch(options.linedisplay) {
if(aa->recv[i] + aa->sent[i] != bb->recv[i] + bb->sent[i]) { case OPTION_LINEDISPLAY_ONE_LINE_SENT:
return(aa->recv[i] + aa->sent[i] < bb->recv[i] + bb->sent[i]); for(i = start_div; i < HISTORY_DIVISIONS; i++) {
if(aa->sent[i] != bb->sent[i]) {
return(aa->sent[i] < bb->sent[i]);
}
} }
break;
case OPTION_LINEDISPLAY_ONE_LINE_RECV:
for(i = start_div; i < HISTORY_DIVISIONS; i++) {
if(aa->recv[i] != bb->recv[i]) {
return(aa->recv[i] < bb->recv[i]);
}
}
break;
case OPTION_LINEDISPLAY_TWO_LINE:
case OPTION_LINEDISPLAY_ONE_LINE_BOTH:
/* fallback to the combined sent+recv that also act as fallback for sent/recv */
break;
}
for(i = start_div; i < HISTORY_DIVISIONS; i++) {
if(aa->recv[i] + aa->sent[i] != bb->recv[i] + bb->sent[i]) {
return(aa->recv[i] + aa->sent[i] < bb->recv[i] + bb->sent[i]);
}
} }
return 1; return 1;
} }