8:21 a.m.
Vitezslav Samel (12):
use printw(win, "%*c", len, ' ') to print len spaces
use mvwprintw() instead of wmove()/wprintw() combo
tui/input.c: fix open coded padding printing
tx_operate_listbox(): remove unused keystroke parameter
tui/listbox.c: tx_operate_listbox(): remove unneeded check
tui/listbox.h: remove unused struct members
tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
tui/listbox.c: simplify tx_destroy_list()
ifstats.c: reduce params to printifentry()
ifstats.c: allow scrolling with Home, End, PageUp and PageDown keys
ifstats.c: call showrates() right after starting or scrolling the view
detstats.c: print broadcasts the same way as other protocols
src/deskman.c | 13 ++----
src/detstats.c | 43 ++++++++++++-----
src/fltmgr.c | 3 +-
src/hostmon.c | 53 +++++++--------------
src/ifstats.c | 111 +++++++++++++++++++--------------------------
src/itrafmon.c | 16 ++-----
src/landesc.c | 9 +---
src/options.c | 3 +-
src/othptab.c | 8 +---
src/pktsize.c | 9 +---
src/serv.c | 45 +++++-------------
src/tcptable.c | 30 ++++--------
src/timer.c | 3 +-
src/tui/input.c | 14 +-----
src/tui/listbox.c | 126 +++++++++++++++++++++++++++++-----------------------
src/tui/listbox.h | 9 +---
src/tui/menurt.c | 3 +-
src/tui/msgboxes.c | 3 +-
src/tui/winops.c | 7 +--
19 files changed, 218 insertions(+), 290 deletions(-)
--
1.7.8.4
8:21 a.m.
New subject: [PATCH 01/12] use printw(win, "%*c", len, ' ') to print len spaces
makes the code more readable and also exe smaller (cca 400B)
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/deskman.c | 13 ++++---------
src/hostmon.c | 7 ++-----
src/ifstats.c | 7 ++-----
src/itrafmon.c | 11 +++--------
src/othptab.c | 7 ++-----
src/serv.c | 16 ++++------------
src/tcptable.c | 6 ++----
src/tui/listbox.c | 12 +++---------
src/tui/winops.c | 4 +---
9 files changed, 23 insertions(+), 60 deletions(-)
diff --git a/src/deskman.c b/src/deskman.c
index e180ea4..ba73796 100644
--- a/src/deskman.c
+++ b/src/deskman.c
@@ -54,21 +54,19 @@ int ICMPV6ATTR;
void draw_desktop(void)
{
int row; /* counter for desktop construction */
- char sp_buf[10];
- sprintf(sp_buf, "%%%dc", COLS);
scrollok(stdscr, 0);
attrset(STATUSBARATTR);
move(0, 0);
- printw(sp_buf, ' '); /* these two print the top n' bottom */
+ printw("%*c", COLS, ' '); /* these two print the top n' bottom */
move(LINES - 1, 0);
- printw(sp_buf, ' '); /* lines */
+ printw("%*c", COLS, ' '); /* lines */
attrset(FIELDATTR);
for (row = 1; row <= LINES - 2; row++) { /* draw the background */
move(row, 0);
- printw(sp_buf, ' ');
+ printw("%*c", COLS, ' ');
}
refresh();
@@ -172,11 +170,8 @@ void tabkeyhelp(WINDOW * win)
void indicate(char *message)
{
- char sp_buf[10];
-
attrset(STATUSBARATTR);
- sprintf(sp_buf, "%%%dc", COLS);
- mvprintw(LINES - 1, 0, sp_buf, ' ');
+ mvprintw(LINES - 1, 0, "%*c", COLS, ' ');
mvprintw(LINES - 1, 1, message);
refresh();
}
diff --git a/src/hostmon.c b/src/hostmon.c
index de72163..1548a0a 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -469,9 +469,6 @@ static void refresh_hostmon_screen(struct ethtab *table, unsigned int
idx)
static void scrollethwin(struct ethtab *table, int direction, unsigned int *idx)
{
- char sp_buf[10];
-
- sprintf(sp_buf, "%%%dc", COLS - 2);
wattrset(table->tabwin, STDATTR);
if (direction == SCROLLUP) {
if (table->lastvisible != table->tail) {
@@ -481,7 +478,7 @@ static void scrollethwin(struct ethtab *table, int direction, unsigned
int *idx)
(*idx)++;
wmove(table->tabwin, LINES - 5, 0);
scrollok(table->tabwin, 0);
- wprintw(table->tabwin, sp_buf, ' ');
+ wprintw(table->tabwin, "%*c", COLS - 2, ' ');
scrollok(table->tabwin, 1);
printethent(table, table->lastvisible, *idx);
if (table->lastvisible->type == 1)
@@ -495,7 +492,7 @@ static void scrollethwin(struct ethtab *table, int direction, unsigned
int *idx)
table->firstvisible = table->firstvisible->prev_entry;
(*idx)--;
wmove(table->tabwin, 0, 0);
- wprintw(table->tabwin, sp_buf, ' ');
+ wprintw(table->tabwin, "%*c", COLS - 2, ' ');
printethent(table, table->firstvisible, *idx);
if (table->firstvisible->type == 1)
printrates(table, 0, table->firstvisible);
diff --git a/src/ifstats.c b/src/ifstats.c
index f2ff72e..b11d853 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -382,9 +382,6 @@ static void initiftab(struct iftab *table)
static void scrollgstatwin(struct iftab *table, int direction)
{
- char buf[255];
-
- sprintf(buf, "%%%dc", COLS - 2);
wattrset(table->statwin, STDATTR);
if (direction == SCROLLUP) {
if (table->lastvisible->next_entry != NULL) {
@@ -393,7 +390,7 @@ static void scrollgstatwin(struct iftab *table, int direction)
table->firstvisible = table->firstvisible->next_entry;
wmove(table->statwin, LINES - 5, 0);
scrollok(table->statwin, 0);
- wprintw(table->statwin, buf, ' ');
+ wprintw(table->statwin, "%*c", COLS - 2, ' ');
scrollok(table->statwin, 1);
printifentry(table->lastvisible, table->statwin,
table->firstvisible->index);
@@ -404,7 +401,7 @@ static void scrollgstatwin(struct iftab *table, int direction)
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
wmove(table->statwin, 0, 0);
- wprintw(table->statwin, buf, ' ');
+ wprintw(table->statwin, "%*c", COLS - 2, ' ');
printifentry(table->firstvisible, table->statwin,
table->firstvisible->index);
}
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 670ab6d..259bd2f 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -117,9 +117,6 @@ static void show_stats(WINDOW * win, unsigned long long total)
static void scrollupperwin(struct tcptable *table, int direction,
unsigned long *idx, int mode)
{
- char sp_buf[10];
-
- sprintf(sp_buf, "%%%dc", COLS - 2);
wattrset(table->tcpscreen, STDATTR);
if (direction == SCROLLUP) {
if (table->lastvisible != table->tail) {
@@ -129,7 +126,7 @@ static void scrollupperwin(struct tcptable *table, int direction,
(*idx)++;
wmove(table->tcpscreen, table->imaxy - 1, 0);
scrollok(table->tcpscreen, 0);
- wprintw(table->tcpscreen, sp_buf, ' ');
+ wprintw(table->tcpscreen, "%*c", COLS - 2, ' ');
scrollok(table->tcpscreen, 1);
printentry(table, table->lastvisible, *idx, mode);
}
@@ -140,7 +137,7 @@ static void scrollupperwin(struct tcptable *table, int direction,
table->lastvisible = table->lastvisible->prev_entry;
(*idx)--;
wmove(table->tcpscreen, 0, 0);
- wprintw(table->tcpscreen, sp_buf, ' ');
+ wprintw(table->tcpscreen, "%*c", COLS - 2, ' ');
printentry(table, table->firstvisible, *idx, mode);
}
}
@@ -550,7 +547,6 @@ void ipmon(time_t facilitytime, char *ifptr)
unsigned int frag_off;
struct tcphdr *transpacket; /* IP-encapsulated packet */
in_port_t sport = 0, dport = 0; /* TCP/UDP port values */
- char sp_buf[10];
unsigned long screen_idx = 1;
@@ -627,8 +623,7 @@ void ipmon(time_t facilitytime, char *ifptr)
statpanel = new_panel(statwin);
wattrset(statwin, IPSTATLABELATTR);
wmove(statwin, 0, 0);
- sprintf(sp_buf, "%%%dc", COLS);
- wprintw(statwin, sp_buf, ' ');
+ wprintw(statwin, "%*c", COLS, ' ');
prepare_statwin(statwin);
show_stats(statwin, 0);
markactive(curwin, table.borderwin, othptbl.borderwin);
diff --git a/src/othptab.c b/src/othptab.c
index 142c9c2..85acf58 100644
--- a/src/othptab.c
+++ b/src/othptab.c
@@ -341,7 +341,6 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
char additional[MSGSTRING_MAX];
char msgstring[MSGSTRING_MAX];
char scratchpad[MSGSTRING_MAX];
- char sp_buf[SHORTSTRING_MAX];
char *startstr;
char *packet_type;
@@ -354,8 +353,6 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
struct protoent *protptr;
- sprintf(sp_buf, "%%%dc", COLS - 2);
-
wmove(table->borderwin, table->obmaxy - 1, 1);
if ((table->lastvisible == table->tail) && (table->htstat != TIND)
&& (table->count >= table->oimaxy)) {
@@ -370,7 +367,7 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
wmove(table->othpwin, target_row, 0);
scrollok(table->othpwin, 0);
wattrset(table->othpwin, UNKNATTR);
- wprintw(table->othpwin, sp_buf, ' ');
+ wprintw(table->othpwin, "%*c", COLS - 2, ' ');
scrollok(table->othpwin, 1);
wmove(table->othpwin, target_row, 1);
@@ -726,7 +723,7 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
wmove(table->othpwin, target_row, 0);
scrollok(table->othpwin, 0);
- wprintw(table->othpwin, sp_buf, ' ');
+ wprintw(table->othpwin, "%*c", COLS - 2, ' ');
scrollok(table->othpwin, 1);
wmove(table->othpwin, target_row, 1);
startstr = msgstring + table->strindex;
diff --git a/src/serv.c b/src/serv.c
index a41d627..ba0e887 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -277,7 +277,6 @@ static void printportent(struct portlist *list, struct portlistent
*entry,
int tcplabelattr;
int udplabelattr;
int highattr;
- char sp_buf[10];
if ((entry->idx < idx) || (entry->idx > idx + (LINES - 6)))
return;
@@ -295,9 +294,8 @@ static void printportent(struct portlist *list, struct portlistent
*entry,
}
wattrset(list->win, tcplabelattr);
- sprintf(sp_buf, "%%%dc", COLS - 2);
scrollok(list->win, 0);
- mvwprintw(list->win, target_row, 0, sp_buf, ' ');
+ mvwprintw(list->win, target_row, 0, "%*c", COLS - 2, ' ');
scrollok(list->win, 1);
wmove(list->win, target_row, 1);
@@ -627,9 +625,6 @@ static void sortportents(struct portlist *list, unsigned int *idx, int
command)
static void scrollservwin(struct portlist *table, int direction,
unsigned int *idx)
{
- char sp_buf[10];
-
- sprintf(sp_buf, "%%%dc", COLS - 2);
wattrset(table->win, STDATTR);
if (direction == SCROLLUP) {
if (table->lastvisible != table->tail) {
@@ -639,7 +634,7 @@ static void scrollservwin(struct portlist *table, int direction,
(*idx)++;
wmove(table->win, LINES - 6, 0);
scrollok(table->win, 0);
- wprintw(table->win, sp_buf, ' ');
+ wprintw(table->win, "%*c", COLS - 2, ' ');
scrollok(table->win, 1);
printportent(table, table->lastvisible, *idx);
}
@@ -650,7 +645,7 @@ static void scrollservwin(struct portlist *table, int direction,
table->firstvisible = table->firstvisible->prev_entry;
(*idx)--;
wmove(table->win, 0, 0);
- wprintw(table->win, sp_buf, ' ');
+ wprintw(table->win, "%*c", COLS - 2, ' ');
printportent(table, table->firstvisible, *idx);
}
}
@@ -780,8 +775,6 @@ void servmon(char *ifname, time_t facilitytime)
WINDOW *statwin;
PANEL *statpanel;
- char sp_buf[10];
-
int fd;
struct porttab *ports;
@@ -804,8 +797,7 @@ void servmon(char *ifname, time_t facilitytime)
statpanel = new_panel(statwin);
scrollok(statwin, 0);
wattrset(statwin, IPSTATLABELATTR);
- sprintf(sp_buf, "%%%dc", COLS);
- mvwprintw(statwin, 0, 0, sp_buf, ' ');
+ mvwprintw(statwin, 0, 0, "%*c", COLS, ' ');
move(LINES - 1, 1);
scrollkeyhelp();
diff --git a/src/tcptable.c b/src/tcptable.c
index 956866c..e1a6ed8 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -809,8 +809,7 @@ void printentry(struct tcptable *table, struct tcptableent
*tableentry,
wmove(table->tcpscreen, target_row, 2);
if (tableentry->reused) {
scrollok(table->tcpscreen, 0);
- sprintf(sp_buf, "%%%dc", COLS - 4);
- wprintw(table->tcpscreen, sp_buf, ' ');
+ wprintw(table->tcpscreen, "%*c", COLS - 4, ' ');
scrollok(table->tcpscreen, 1);
tableentry->reused = 0;
wmove(table->tcpscreen, target_row, 1);
@@ -823,8 +822,7 @@ void printentry(struct tcptable *table, struct tcptableent
*tableentry,
/* proceed with the actual entry */
wattrset(table->tcpscreen, normalattr);
- sprintf(sp_buf, "%%%dc", COLS - 5);
- mvwprintw(table->tcpscreen, target_row, 2, sp_buf, ' ');
+ mvwprintw(table->tcpscreen, target_row, 2, "%*c", COLS - 5, ' ');
sprintf(sp_buf, "%%.%ds:%%.%ds", 32 * COLS / 80, 10);
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index a9d528c..ce8d5bf 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -83,8 +83,7 @@ void tx_operate_listbox(struct scroll_list *list, int *keystroke, int
*aborted)
int ch;
int endloop = 0;
int row = 0;
- char padding[MAX_TEXT_LENGTH];
- char sp_buf[10];
+ int width = list->width - 3;
if (list->textlist == NULL) {
tui_error(ANYKEY_MSG, "No list entries");
@@ -99,18 +98,13 @@ void tx_operate_listbox(struct scroll_list *list, int *keystroke, int
*aborted)
doupdate();
while (!endloop) {
- snprintf(sp_buf, 9, "%%%zuc",
- list->width - strlen(list->textptr->text) - 3);
- snprintf(padding, MAX_TEXT_LENGTH - 1, sp_buf, ' ');
wattrset(list->win, list->selectattr);
- mvwprintw(list->win, row, 0, " %s%s", list->textptr->text,
- padding);
+ mvwprintw(list->win, row, 0, " %-*s", width, list->textptr->text);
ch = wgetch(list->win);
wattrset(list->win, list->mainattr);
- mvwprintw(list->win, row, 0, " %s%s", list->textptr->text,
- padding);
+ mvwprintw(list->win, row, 0, " %-*s", width, list->textptr->text);
switch (ch) {
case KEY_UP:
diff --git a/src/tui/winops.c b/src/tui/winops.c
index 73a3899..2b953b1 100644
--- a/src/tui/winops.c
+++ b/src/tui/winops.c
@@ -50,13 +50,11 @@ void tx_wcoloreol(WINDOW * win)
int x, curx;
int y __unused;
int cury __unused;
- char sp_buf[10];
getyx(win, cury, curx);
getmaxyx(win, y, x);
- sprintf(sp_buf, "%%%dc", x - curx - 1);
scrollok(win, 0);
- wprintw(win, sp_buf, ' ');
+ wprintw(win, "%*c", x - curx - 1, ' ');
}
/*
--
1.7.8.4
8:21 a.m.
New subject: [PATCH 02/12] use mvwprintw() instead of wmove()/wprintw() combo
makes the code more readable and also exe smaller (cca 700B)
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/hostmon.c | 50 ++++++++++++++++++--------------------------------
src/ifstats.c | 33 +++++++++++----------------------
src/itrafmon.c | 9 +++------
src/landesc.c | 6 ++----
src/options.c | 3 +--
src/othptab.c | 3 +--
src/pktsize.c | 9 +++------
src/serv.c | 30 ++++++++++--------------------
src/tcptable.c | 24 ++++++++----------------
src/timer.c | 3 +--
src/tui/input.c | 9 +++------
src/tui/menurt.c | 3 +--
src/tui/msgboxes.c | 3 +--
src/tui/winops.c | 3 +--
14 files changed, 64 insertions(+), 124 deletions(-)
diff --git a/src/hostmon.c b/src/hostmon.c
index 1548a0a..44dcf40 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -162,28 +162,18 @@ static void initethtab(struct ethtab *table)
wattrset(table->borderwin, BOXATTR);
tx_box(table->borderwin, ACS_VLINE, ACS_HLINE);
- wmove(table->borderwin, 0, 5 * COLS / 80);
- wprintw(table->borderwin, " PktsIn ");
- wmove(table->borderwin, 0, 16 * COLS / 80);
- wprintw(table->borderwin, " IP In ");
- wmove(table->borderwin, 0, 24 * COLS / 80);
- wprintw(table->borderwin, " BytesIn ");
- wmove(table->borderwin, 0, 34 * COLS / 80);
- wprintw(table->borderwin, " InRate ");
-
- wmove(table->borderwin, 0, 42 * COLS / 80);
- wprintw(table->borderwin, " PktsOut ");
- wmove(table->borderwin, 0, 53 * COLS / 80);
- wprintw(table->borderwin, " IP Out ");
- wmove(table->borderwin, 0, 61 * COLS / 80);
- wprintw(table->borderwin, " BytesOut ");
- wmove(table->borderwin, 0, 70 * COLS / 80);
- wprintw(table->borderwin, " OutRate ");
-
- wmove(table->borderwin, LINES - 3, 40);
-
- wprintw(table->borderwin, " InRate and OutRate are in %s ",
- dispmode(options.actmode));
+
+ mvwprintw(table->borderwin, 0, 5 * COLS / 80, " PktsIn ");
+ mvwprintw(table->borderwin, 0, 16 * COLS / 80, " IP In ");
+ mvwprintw(table->borderwin, 0, 24 * COLS / 80, " BytesIn ");
+ mvwprintw(table->borderwin, 0, 34 * COLS / 80, " InRate ");
+ mvwprintw(table->borderwin, 0, 42 * COLS / 80, " PktsOut ");
+ mvwprintw(table->borderwin, 0, 53 * COLS / 80, " IP Out ");
+ mvwprintw(table->borderwin, 0, 61 * COLS / 80, " BytesOut ");
+ mvwprintw(table->borderwin, 0, 70 * COLS / 80, " OutRate ");
+
+ mvwprintw(table->borderwin, LINES - 3, 40,
+ " InRate and OutRate are in %s ", dispmode(options.actmode));
wattrset(table->tabwin, STDATTR);
tx_colorwin(table->tabwin);
@@ -283,8 +273,8 @@ static struct ethtabent *addethentry(struct ethtab *table,
table->entcount++;
- wmove(table->borderwin, LINES - 3, 1);
- wprintw(table->borderwin, " %u entries ", table->entcount);
+ mvwprintw(table->borderwin, LINES - 3, 1, " %u entries ",
+ table->entcount);
return ptemp;
}
@@ -414,13 +404,11 @@ static void printrates(struct ethtab *table, unsigned int
target_row,
rate_print_no_units(rate_get_average(&ptmp->un.figs.inrate),
buf, sizeof(buf));
- wmove(table->tabwin, target_row, 32 * COLS / 80);
- wprintw(table->tabwin, "%s", buf);
+ mvwprintw(table->tabwin, target_row, 32 * COLS / 80, "%s", buf);
rate_print_no_units(rate_get_average(&ptmp->un.figs.outrate),
buf, sizeof(buf));
- wmove(table->tabwin, target_row, 69 * COLS / 80);
- wprintw(table->tabwin, "%s", buf);
+ mvwprintw(table->tabwin, target_row, 69 * COLS / 80, "%s", buf);
}
static void updateethrates(struct ethtab *table, unsigned long msecs,
@@ -476,9 +464,8 @@ static void scrollethwin(struct ethtab *table, int direction, unsigned
int *idx)
table->lastvisible = table->lastvisible->next_entry;
table->firstvisible = table->firstvisible->next_entry;
(*idx)++;
- wmove(table->tabwin, LINES - 5, 0);
scrollok(table->tabwin, 0);
- wprintw(table->tabwin, "%*c", COLS - 2, ' ');
+ mvwprintw(table->tabwin, LINES - 5, 0, "%*c", COLS - 2, ' ');
scrollok(table->tabwin, 1);
printethent(table, table->lastvisible, *idx);
if (table->lastvisible->type == 1)
@@ -491,8 +478,7 @@ static void scrollethwin(struct ethtab *table, int direction, unsigned
int *idx)
table->lastvisible = table->lastvisible->prev_entry;
table->firstvisible = table->firstvisible->prev_entry;
(*idx)--;
- wmove(table->tabwin, 0, 0);
- wprintw(table->tabwin, "%*c", COLS - 2, ' ');
+ mvwprintw(table->tabwin, 0, 0, "%*c", COLS - 2, ' ');
printethent(table, table->firstvisible, *idx);
if (table->firstvisible->type == 1)
printrates(table, 0, table->firstvisible);
diff --git a/src/ifstats.c b/src/ifstats.c
index b11d853..3098868 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -298,8 +298,7 @@ static void printifentry(struct iflist *ptmp, WINDOW * win, unsigned
int idx)
target_row = ptmp->index - idx;
wattrset(win, STDATTR);
- wmove(win, target_row, 1);
- wprintw(win, "%s", ptmp->ifname);
+ mvwprintw(win, target_row, 1, "%s", ptmp->ifname);
wattrset(win, HIGHATTR);
wmove(win, target_row, 14 * COLS / 80);
printlargenum(ptmp->total, win);
@@ -333,24 +332,17 @@ static void print_if_entries(struct iftab *table)
static void labelstats(WINDOW *win)
{
- wmove(win, 0, 1);
- wprintw(win, " Iface ");
+ mvwprintw(win, 0, 1, " Iface ");
/* 14, 24, 34, ... from printifentry() */
/* 10 = strlen(printed number); from printlargenum() */
/* 7 = strlen(" Total ") */
/* 1 = align the string on 'l' from " Total " */
- wmove(win, 0, (14 * COLS / 80) + 10 - 7 + 1);
- wprintw(win, " Total ");
- wmove(win, 0, (24 * COLS / 80) + 10 - 6 + 1);
- wprintw(win, " IPv4 ");
- wmove(win, 0, (34 * COLS / 80) + 10 - 6 + 1);
- wprintw(win, " IPv6 ");
- wmove(win, 0, (44 * COLS / 80) + 10 - 7 + 1);
- wprintw(win, " NonIP ");
- wmove(win, 0, (53 * COLS / 80) + 8 - 7 + 1);
- wprintw(win, " BadIP ");
- wmove(win, 0, (63 * COLS / 80) + 14 - 10);
- wprintw(win, " Activity ");
+ mvwprintw(win, 0, (14 * COLS / 80) + 10 - 7 + 1, " Total ");
+ mvwprintw(win, 0, (24 * COLS / 80) + 10 - 6 + 1, " IPv4 ");
+ mvwprintw(win, 0, (34 * COLS / 80) + 10 - 6 + 1, " IPv6 ");
+ mvwprintw(win, 0, (44 * COLS / 80) + 10 - 7 + 1, " NonIP ");
+ mvwprintw(win, 0, (53 * COLS / 80) + 8 - 7 + 1, " BadIP ");
+ mvwprintw(win, 0, (63 * COLS / 80) + 14 - 10, " Activity ");
}
static void initiftab(struct iftab *table)
@@ -371,8 +363,7 @@ static void initiftab(struct iftab *table)
wattrset(table->statwin, STDATTR);
tx_colorwin(table->statwin);
wattrset(table->statwin, BOXATTR);
- wmove(table->borderwin, LINES - 3, 32 * COLS / 80);
- wprintw(table->borderwin,
+ mvwprintw(table->borderwin, LINES - 3, 32 * COLS / 80,
" Total, IP, NonIP, and BadIP are packet counts ");
}
@@ -388,9 +379,8 @@ static void scrollgstatwin(struct iftab *table, int direction)
wscrl(table->statwin, 1);
table->lastvisible = table->lastvisible->next_entry;
table->firstvisible = table->firstvisible->next_entry;
- wmove(table->statwin, LINES - 5, 0);
scrollok(table->statwin, 0);
- wprintw(table->statwin, "%*c", COLS - 2, ' ');
+ mvwprintw(table->statwin, LINES - 5, 0, "%*c", COLS - 2, ' ');
scrollok(table->statwin, 1);
printifentry(table->lastvisible, table->statwin,
table->firstvisible->index);
@@ -400,8 +390,7 @@ static void scrollgstatwin(struct iftab *table, int direction)
wscrl(table->statwin, -1);
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
- wmove(table->statwin, 0, 0);
- wprintw(table->statwin, "%*c", COLS - 2, ' ');
+ mvwprintw(table->statwin, 0, 0, "%*c", COLS - 2, ' ');
printifentry(table->firstvisible, table->statwin,
table->firstvisible->index);
}
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 259bd2f..20c6f6c 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -72,8 +72,7 @@ static void uniq_help(int what)
static void prepare_statwin(WINDOW * win)
{
wattrset(win, IPSTATLABELATTR);
- wmove(win, 0, 1);
- wprintw(win, "Packets captured:");
+ mvwprintw(win, 0, 1, "Packets captured:");
mvwaddch(win, 0, 45 * COLS / 80, ACS_VLINE);
}
@@ -136,8 +135,7 @@ static void scrollupperwin(struct tcptable *table, int direction,
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
(*idx)--;
- wmove(table->tcpscreen, 0, 0);
- wprintw(table->tcpscreen, "%*c", COLS - 2, ' ');
+ mvwprintw(table->tcpscreen, 0, 0, "%*c", COLS - 2, ' ');
printentry(table, table->firstvisible, *idx, mode);
}
}
@@ -622,8 +620,7 @@ void ipmon(time_t facilitytime, char *ifptr)
statwin = newwin(1, COLS, LINES - 2, 0);
statpanel = new_panel(statwin);
wattrset(statwin, IPSTATLABELATTR);
- wmove(statwin, 0, 0);
- wprintw(statwin, "%*c", COLS, ' ');
+ mvwprintw(statwin, 0, 0, "%*c", COLS, ' ');
prepare_statwin(statwin);
show_stats(statwin, 0);
markactive(curwin, table.borderwin, othptbl.borderwin);
diff --git a/src/landesc.c b/src/landesc.c
index 4d67ed8..1f48137 100644
--- a/src/landesc.c
+++ b/src/landesc.c
@@ -254,10 +254,8 @@ static int dialog_eth_desc(struct FIELDLIST *fields, const char
*initaddr,
stdkeyhelp(win);
wattrset(win, DLGTEXTATTR);
- wmove(win, 2, 2 * COLS / 80);
- wprintw(win, "MAC Address:");
- wmove(win, 4, 2 * COLS / 80);
- wprintw(win, "Description:");
+ mvwprintw(win, 2, 2 * COLS / 80, "MAC Address:");
+ mvwprintw(win, 4, 2 * COLS / 80, "Description:");
tx_initfields(fields, 3, 52, 10, (COLS - 52) / 2 + 6 * COLS / 80,
DLGTEXTATTR, FIELDATTR);
diff --git a/src/options.c b/src/options.c
index a1cd4f8..c9b1ed1 100644
--- a/src/options.c
+++ b/src/options.c
@@ -212,8 +212,7 @@ static void settimeout(time_t *value, const char *units, int
allow_zero,
tx_box(dlgwin, ACS_VLINE, ACS_HLINE);
wattrset(dlgwin, DLGTEXTATTR);
- wmove(dlgwin, 2, 2);
- wprintw(dlgwin, "Enter value in %s", units);
+ mvwprintw(dlgwin, 2, 2, "Enter value in %s", units);
wmove(dlgwin, 5, 2);
stdkeyhelp(dlgwin);
diff --git a/src/othptab.c b/src/othptab.c
index 85acf58..5c09241 100644
--- a/src/othptab.c
+++ b/src/othptab.c
@@ -721,9 +721,8 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
strcat(msgstring, " on ");
strcat(msgstring, entry->iface);
- wmove(table->othpwin, target_row, 0);
scrollok(table->othpwin, 0);
- wprintw(table->othpwin, "%*c", COLS - 2, ' ');
+ mvwprintw(table->othpwin, target_row, 0, "%*c", COLS - 2, ' ');
scrollok(table->othpwin, 1);
wmove(table->othpwin, target_row, 1);
startstr = msgstring + table->strindex;
diff --git a/src/pktsize.c b/src/pktsize.c
index f30210f..54fb680 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -77,12 +77,10 @@ static int initialize_brackets(struct ifstat_brackets *brackets,
for (i = 0; i <= 9; i++) {
wattrset(win, STDATTR);
- wmove(win, i + 5, 2);
- wprintw(win, "%4u to %4u:", brackets[i].floor,
+ mvwprintw(win, i + 5, 2, "%4u to %4u:", brackets[i].floor,
brackets[i].ceil);
- wmove(win, i + 5, 23);
wattrset(win, HIGHATTR);
- wprintw(win, "%8lu", 0);
+ mvwprintw(win, i + 5, 23, "%8lu", 0);
}
for (i = 10; i <= 19; i++) {
@@ -96,9 +94,8 @@ static int initialize_brackets(struct ifstat_brackets *brackets,
wprintw(win, "%4u to %4u+:", brackets[i].floor,
brackets[i].ceil);
- wmove(win, (i - 10) + 5, 57);
wattrset(win, HIGHATTR);
- wprintw(win, "%8lu", 0);
+ mvwprintw(win, (i - 10) + 5, 57, "%8lu", 0);
}
wattrset(win, STDATTR);
diff --git a/src/serv.c b/src/serv.c
index ba0e887..34421b3 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -159,20 +159,13 @@ static void initportlist(struct portlist *list)
wattrset(list->borderwin, BOXATTR);
tx_box(list->borderwin, ACS_VLINE, ACS_HLINE);
- wmove(list->borderwin, 0, 1 * screen_scale);
- wprintw(list->borderwin, " Proto/Port ");
- wmove(list->borderwin, 0, 22 * screen_scale);
- wprintw(list->borderwin, " Pkts ");
- wmove(list->borderwin, 0, 31 * screen_scale);
- wprintw(list->borderwin, " Bytes ");
- wmove(list->borderwin, 0, 40 * screen_scale);
- wprintw(list->borderwin, " PktsTo ");
- wmove(list->borderwin, 0, 49 * screen_scale);
- wprintw(list->borderwin, " BytesTo ");
- wmove(list->borderwin, 0, 58 * screen_scale);
- wprintw(list->borderwin, " PktsFrom ");
- wmove(list->borderwin, 0, 67 * screen_scale);
- wprintw(list->borderwin, " BytesFrom ");
+ mvwprintw(list->borderwin, 0, 1 * screen_scale, " Proto/Port ");
+ mvwprintw(list->borderwin, 0, 22 * screen_scale, " Pkts ");
+ mvwprintw(list->borderwin, 0, 31 * screen_scale, " Bytes ");
+ mvwprintw(list->borderwin, 0, 40 * screen_scale, " PktsTo ");
+ mvwprintw(list->borderwin, 0, 49 * screen_scale, " BytesTo ");
+ mvwprintw(list->borderwin, 0, 58 * screen_scale, " PktsFrom ");
+ mvwprintw(list->borderwin, 0, 67 * screen_scale, " BytesFrom ");
list->win = newwin(LINES - 5, COLS - 2, 2, 1);
list->panel = new_panel(list->win);
@@ -228,8 +221,7 @@ static struct portlistent *addtoportlist(struct portlist *list,
if (list->count <= (unsigned) LINES - 5)
list->lastvisible = ptemp;
- wmove(list->borderwin, LINES - 4, 1);
- wprintw(list->borderwin, " %u entries ", list->count);
+ mvwprintw(list->borderwin, LINES - 4, 1, " %u entries ", list->count);
return ptemp;
}
@@ -632,9 +624,8 @@ static void scrollservwin(struct portlist *table, int direction,
table->lastvisible = table->lastvisible->next_entry;
table->firstvisible = table->firstvisible->next_entry;
(*idx)++;
- wmove(table->win, LINES - 6, 0);
scrollok(table->win, 0);
- wprintw(table->win, "%*c", COLS - 2, ' ');
+ mvwprintw(table->win, LINES - 6, 0, "%*c", COLS - 2, ' ');
scrollok(table->win, 1);
printportent(table, table->lastvisible, *idx);
}
@@ -644,8 +635,7 @@ static void scrollservwin(struct portlist *table, int direction,
table->lastvisible = table->lastvisible->prev_entry;
table->firstvisible = table->firstvisible->prev_entry;
(*idx)--;
- wmove(table->win, 0, 0);
- wprintw(table->win, "%*c", COLS - 2, ' ');
+ mvwprintw(table->win, 0, 0, "%*c", COLS - 2, ' ');
printportent(table, table->firstvisible, *idx);
}
}
diff --git a/src/tcptable.c b/src/tcptable.c
index e1a6ed8..a4133d9 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -33,17 +33,13 @@ static void setlabels(WINDOW *win, int mode)
whline(win, ACS_HLINE, 23 * COLS / 80);
if (mode == 0) {
- wmove(win, 0, 47 * COLS / 80);
- wprintw(win, " Packets ");
- wmove(win, 0, 59 * COLS / 80);
- wprintw(win, " Bytes ");
+ mvwprintw(win, 0, 47 * COLS / 80, " Packets ");
+ mvwprintw(win, 0, 59 * COLS / 80, " Bytes ");
} else if (mode == 1) {
mvwprintw(win, 0, 47 * COLS / 80, " Source MAC Addr ");
} else if (mode == 2) {
- wmove(win, 0, 45 * COLS / 80);
- wprintw(win, " Pkt Size ");
- wmove(win, 0, 56 * COLS / 80);
- wprintw(win, " Win Size ");
+ mvwprintw(win, 0, 45 * COLS / 80, " Pkt Size ");
+ mvwprintw(win, 0, 56 * COLS / 80, " Win Size ");
}
}
@@ -112,15 +108,12 @@ void init_tcp_table(struct tcptable *table)
wattrset(table->borderwin, BOXATTR);
tx_box(table->borderwin, ACS_VLINE, ACS_HLINE);
- wmove(table->borderwin, 0, 1);
- wprintw(table->borderwin, " TCP Connections (Source Host:Port) ");
+ mvwprintw(table->borderwin, 0, 1, " TCP Connections (Source Host:Port) ");
setlabels(table->borderwin, 0); /* initially use mode 0 */
- wmove(table->borderwin, 0, 65 * COLS / 80);
- wprintw(table->borderwin, " Flag ");
- wmove(table->borderwin, 0, 70 * COLS / 80);
- wprintw(table->borderwin, " Iface ");
+ mvwprintw(table->borderwin, 0, 65 * COLS / 80, " Flag ");
+ mvwprintw(table->borderwin, 0, 70 * COLS / 80, " Iface ");
update_panels();
doupdate();
table->ifnamew = COLS - (70 * COLS / 80) - 3;
@@ -767,8 +760,7 @@ void clearaddr(struct tcptable *table, struct tcptableent
*tableentry,
target_row = (tableentry->index) - screen_idx;
- wmove(table->tcpscreen, target_row, 1);
- wprintw(table->tcpscreen, "%44c", ' ');
+ mvwprintw(table->tcpscreen, target_row, 1, "%44c", ' ');
}
/*
diff --git a/src/timer.c b/src/timer.c
index 64bef53..08fed75 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -21,6 +21,5 @@ void printelapsedtime(time_t start, time_t now, int y, int x, WINDOW *
win)
hours = elapsed / 3600;
mins = (elapsed % 3600) / 60;
- wmove(win, y, x);
- wprintw(win, " Elapsed time: %3u:%02u ", hours, mins);
+ mvwprintw(win, y, x, " Elapsed time: %3u:%02u ", hours, mins);
}
diff --git a/src/tui/input.c b/src/tui/input.c
index b0742c3..2f76ed3 100644
--- a/src/tui/input.c
+++ b/src/tui/input.c
@@ -62,8 +62,7 @@ void tx_addfield(struct FIELDLIST *list, unsigned int len, unsigned int
y,
for (i = 1; i <= len; i++)
wprintw(list->fieldwin, " ");
- wmove(list->fieldwin, y, x);
- wprintw(list->fieldwin, "%s", newfield->buf);
+ mvwprintw(list->fieldwin, y, x, "%s", newfield->buf);
update_panels();
doupdate();
@@ -75,9 +74,8 @@ void tx_getinput(struct FIELDLIST *list, struct FIELD *field, int
*exitkey)
int y, x;
int endloop = 0;
- wmove(list->fieldwin, field->ypos, field->xpos);
wattrset(list->fieldwin, list->fieldattr);
- wprintw(list->fieldwin, "%s", field->buf);
+ mvwprintw(list->fieldwin, field->ypos, field->xpos, "%s",
field->buf);
update_panels();
doupdate();
@@ -93,8 +91,7 @@ void tx_getinput(struct FIELDLIST *list, struct FIELD *field, int
*exitkey)
if (field->tlen > 0) {
getyx(list->fieldwin, y, x);
x--;
- wmove(list->fieldwin, y, x);
- wprintw(list->fieldwin, " ");
+ mvwprintw(list->fieldwin, y, x, " ");
wmove(list->fieldwin, y, x);
field->tlen--;
field->buf[field->tlen] = '\0';
diff --git a/src/tui/menurt.c b/src/tui/menurt.c
index 265e297..b4c153a 100644
--- a/src/tui/menurt.c
+++ b/src/tui/menurt.c
@@ -200,8 +200,7 @@ void tx_operatemenu(struct MENU *menu, int *position, int *aborted)
wattrset(menu->descwin, menu->descriptionattr);
tx_colorwin(menu->descwin);
- wmove(menu->descwin, 0, 0);
- wprintw(menu->descwin, " %s", itemptr->desc);
+ mvwprintw(menu->descwin, 0, 0, " %s", itemptr->desc);
update_panels();
doupdate();
diff --git a/src/tui/msgboxes.c b/src/tui/msgboxes.c
index ee7ebdf..0b58716 100644
--- a/src/tui/msgboxes.c
+++ b/src/tui/msgboxes.c
@@ -39,9 +39,8 @@ void tui_error_va(const char *prompt, const char *err, va_list vararg)
wattrset(win, ERR_BORDER_ATTR);
tx_colorwin(win);
tx_box(win, ACS_VLINE, ACS_HLINE);
- wmove(win, 2, 2);
wattrset(win, ERR_PROMPT_ATTR);
- wprintw(win, "%s", prompt);
+ mvwprintw(win, 2, 2, "%s", prompt);
wattrset(win, ERR_TEXT_ATTR);
wmove(win, 1, 2);
diff --git a/src/tui/winops.c b/src/tui/winops.c
index 2b953b1..e323631 100644
--- a/src/tui/winops.c
+++ b/src/tui/winops.c
@@ -38,8 +38,7 @@ void tx_colorwin(WINDOW * win)
scrollok(win, 0);
for (ctr = 0; ctr < getmaxy(win); ctr++) {
- wmove(win, ctr, 0);
- wprintw(win, "%s", blankpad);
+ mvwprintw(win, ctr, 0, "%s", blankpad);
}
scrollok(win, 1);
free(blankpad);
--
1.7.8.4
8:21 a.m.
New subject: [PATCH 03/12] tui/input.c: fix open coded padding printing
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/input.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/tui/input.c b/src/tui/input.c
index 2f76ed3..d45ae0d 100644
--- a/src/tui/input.c
+++ b/src/tui/input.c
@@ -32,7 +32,6 @@ void tx_addfield(struct FIELDLIST *list, unsigned int len, unsigned int
y,
unsigned int x, const char *initstr)
{
struct FIELD *newfield;
- unsigned int i;
newfield = xmalloc(sizeof(struct FIELD));
@@ -58,11 +57,7 @@ void tx_addfield(struct FIELDLIST *list, unsigned int len, unsigned int
y,
newfield->tlen = len;
wattrset(list->fieldwin, list->fieldattr);
- wmove(list->fieldwin, y, x);
- for (i = 1; i <= len; i++)
- wprintw(list->fieldwin, " ");
-
- mvwprintw(list->fieldwin, y, x, "%s", newfield->buf);
+ mvwprintw(list->fieldwin, y, x, "%-*s", len, newfield->buf);
update_panels();
doupdate();
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 04/12] tx_operate_listbox(): remove unused keystroke parameter
... and fix all the calling sites.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/fltmgr.c | 3 +--
src/ifstats.c | 4 +---
src/landesc.c | 3 +--
src/serv.c | 3 +--
src/tui/listbox.c | 3 +--
src/tui/listbox.h | 2 +-
6 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/fltmgr.c b/src/fltmgr.c
index ad194ee..370194c 100644
--- a/src/fltmgr.c
+++ b/src/fltmgr.c
@@ -228,7 +228,6 @@ void save_filterlist(struct ffnode *fltlist)
void operate_select(struct ffnode *ffiles, struct ffnode **item, int *aborted)
{
struct ffnode *pptr;
- int ch;
struct scroll_list list;
tx_listkeyhelp(STDATTR, HIGHATTR);
@@ -249,7 +248,7 @@ void operate_select(struct ffnode *ffiles, struct ffnode **item, int
*aborted)
}
tx_show_listbox(&list);
- tx_operate_listbox(&list, &ch, aborted);
+ tx_operate_listbox(&list, aborted);
if (!(*aborted))
*item = (struct ffnode *) list.textptr->nodeptr;
diff --git a/src/ifstats.c b/src/ifstats.c
index 3098868..8e15979 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -636,8 +636,6 @@ err:
void selectiface(char *ifname, int withall, int *aborted)
{
- int ch;
-
struct iflist *list;
struct iflist *ptmp;
@@ -678,7 +676,7 @@ void selectiface(char *ifname, int withall, int *aborted)
}
tx_show_listbox(&scrolllist);
- tx_operate_listbox(&scrolllist, &ch, aborted);
+ tx_operate_listbox(&scrolllist, aborted);
tx_close_listbox(&scrolllist);
if (!(*aborted) && (list != NULL)) {
diff --git a/src/landesc.c b/src/landesc.c
index 1f48137..d51c094 100644
--- a/src/landesc.c
+++ b/src/landesc.c
@@ -195,7 +195,6 @@ void free_eth_desc(struct eth_desc *hd)
static struct eth_desc *select_eth_desc(const struct eth_desc *hd)
{
- int resp;
struct scroll_list slist;
char descline[80];
@@ -222,7 +221,7 @@ static struct eth_desc *select_eth_desc(const struct eth_desc *hd)
int aborted = 0;
- tx_operate_listbox(&slist, &resp, &aborted);
+ tx_operate_listbox(&slist, &aborted);
if (!aborted)
entry = (struct eth_desc *) slist.textptr->nodeptr;
diff --git a/src/serv.c b/src/serv.c
index 34421b3..c82bd3a 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -1272,7 +1272,6 @@ void loadaddports(struct porttab **table)
static void operate_portselect(struct porttab **table, struct porttab **node,
int *aborted)
{
- int ch = 0;
struct scroll_list list;
char listtext[20];
@@ -1290,7 +1289,7 @@ static void operate_portselect(struct porttab **table, struct
porttab **node,
}
tx_show_listbox(&list);
- tx_operate_listbox(&list, &ch, aborted);
+ tx_operate_listbox(&list, aborted);
if (!(*aborted))
*node = (struct porttab *) list.textptr->nodeptr;
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index ce8d5bf..21b6cb1 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -78,7 +78,7 @@ void tx_show_listbox(struct scroll_list *list)
doupdate();
}
-void tx_operate_listbox(struct scroll_list *list, int *keystroke, int *aborted)
+void tx_operate_listbox(struct scroll_list *list, int *aborted)
{
int ch;
int endloop = 0;
@@ -154,7 +154,6 @@ void tx_operate_listbox(struct scroll_list *list, int *keystroke, int
*aborted)
break;
}
}
- *keystroke = ch;
}
void tx_hide_listbox(struct scroll_list *list)
diff --git a/src/tui/listbox.h b/src/tui/listbox.h
index 75637ff..5fa60c0 100644
--- a/src/tui/listbox.h
+++ b/src/tui/listbox.h
@@ -36,7 +36,7 @@ void tx_init_listbox(struct scroll_list *list, int width, int height,
void tx_set_listbox_title(struct scroll_list *list, char *text, int x);
void tx_add_list_entry(struct scroll_list *list, char *node, char *text);
void tx_show_listbox(struct scroll_list *list);
-void tx_operate_listbox(struct scroll_list *list, int *keystroke, int *aborted);
+void tx_operate_listbox(struct scroll_list *list, int *aborted);
void tx_hide_listbox(struct scroll_list *list);
void tx_unhide_listbox(struct scroll_list *list);
void tx_close_listbox(struct scroll_list *list);
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 05/12] tui/listbox.c: tx_operate_listbox(): remove unneeded check
Check for non-empty list is done right after entering into this
function.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/listbox.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index 21b6cb1..2a3faa3 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -108,9 +108,6 @@ void tx_operate_listbox(struct scroll_list *list, int *aborted)
switch (ch) {
case KEY_UP:
- if (list->textptr == NULL)
- continue;
-
if (list->textptr->prev_entry != NULL) {
if (row == 0) {
scrollok(list->win, 1);
@@ -123,9 +120,6 @@ void tx_operate_listbox(struct scroll_list *list, int *aborted)
}
break;
case KEY_DOWN:
- if (list->textptr == NULL)
- continue;
-
if (list->textptr->next_entry != NULL) {
if (row == list->height - 3) {
scrollok(list->win, 1);
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 06/12] tui/listbox.h: remove unused struct members
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/listbox.h | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/tui/listbox.h b/src/tui/listbox.h
index 5fa60c0..4b74a25 100644
--- a/src/tui/listbox.h
+++ b/src/tui/listbox.h
@@ -5,15 +5,12 @@
struct textlisttype {
char text[MAX_TEXT_LENGTH];
- int cellwidth[10]; /* up to 10 cells per line */
char *nodeptr; /* generic pointer, cast to appropriate type */
struct textlisttype *next_entry;
struct textlisttype *prev_entry;
};
struct scroll_list {
- char *mainlist; /* generic pointer, cast to appropriate type */
- char *mlistptr; /* generic pointer, cast to appropriate type */
struct textlisttype *textlist; /* list of raw text entries */
struct textlisttype *texttail;
struct textlisttype *textptr;
@@ -22,14 +19,13 @@ struct scroll_list {
int mainattr;
int selectattr;
int keyattr;
- char *exitkeys;
WINDOW *win;
PANEL *panel;
WINDOW *borderwin;
PANEL *borderpanel;
-
};
+
void tx_init_listbox(struct scroll_list *list, int width, int height,
int startx, int starty, int mainattr, int borderattr,
int selectattr, int keyattr);
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 07/12] tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/listbox.c | 99 ++++++++++++++++++++++++++++++++++++-----------------
src/tui/listbox.h | 1 +
2 files changed, 68 insertions(+), 32 deletions(-)
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index 2a3faa3..bb30ca1 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -12,6 +12,9 @@
#include "listbox.h"
#include "msgboxes.h"
+#define SCROLLUP 0
+#define SCROLLDOWN 1
+
void tx_init_listbox(struct scroll_list *list, int width, int height,
int startx, int starty, int mainattr, int borderattr,
int selectattr, int keyattr)
@@ -32,6 +35,7 @@ void tx_init_listbox(struct scroll_list *list, int width, int height,
list->height = height;
list->width = width;
list->keyattr = keyattr;
+ list->row = 0;
tx_stdwinset(list->win);
scrollok(list->win, 0);
@@ -78,12 +82,56 @@ void tx_show_listbox(struct scroll_list *list)
doupdate();
}
+static void tx_print_row(struct scroll_list *list, int attr)
+{
+ wattrset(list->win, attr);
+ mvwprintw(list->win, list->row, 0, " %-*s", list->width - 3,
+ list->textptr->text);
+
+}
+
+static void tx_scroll_listbox(struct scroll_list *list, int direction,
+ int lines)
+{
+ if (lines < 1)
+ return;
+
+ if (direction == SCROLLUP) {
+ for (int i = 0; i < lines; i++) {
+ if (list->textptr->next_entry == NULL)
+ break;
+
+ tx_print_row(list, list->mainattr);
+ if (list->row == list->height - 3) {
+ scrollok(list->win, 1);
+ wscrl(list->win, 1);
+ scrollok(list->win, 0);
+ } else
+ list->row++;
+ list->textptr = list->textptr->next_entry;
+ tx_print_row(list, list->selectattr);
+ }
+ } else {
+ for (int i = 0; i < lines; i++) {
+ if (list->textptr->prev_entry == NULL)
+ break;
+
+ tx_print_row(list, list->mainattr);
+ if (list->row == 0) {
+ scrollok(list->win, 1);
+ wscrl(list->win, -1);
+ scrollok(list->win, 0);
+ } else
+ list->row--;
+ list->textptr = list->textptr->prev_entry;
+ tx_print_row(list, list->selectattr);
+ }
+ }
+}
+
void tx_operate_listbox(struct scroll_list *list, int *aborted)
{
- int ch;
int endloop = 0;
- int row = 0;
- int width = list->width - 3;
if (list->textlist == NULL) {
tui_error(ANYKEY_MSG, "No list entries");
@@ -97,39 +145,26 @@ void tx_operate_listbox(struct scroll_list *list, int *aborted)
update_panels();
doupdate();
+ tx_print_row(list, list->selectattr);
while (!endloop) {
- wattrset(list->win, list->selectattr);
- mvwprintw(list->win, row, 0, " %-*s", width, list->textptr->text);
-
- ch = wgetch(list->win);
-
- wattrset(list->win, list->mainattr);
- mvwprintw(list->win, row, 0, " %-*s", width, list->textptr->text);
-
- switch (ch) {
+ switch (wgetch(list->win)) {
case KEY_UP:
- if (list->textptr->prev_entry != NULL) {
- if (row == 0) {
- scrollok(list->win, 1);
- wscrl(list->win, -1);
- scrollok(list->win, 0);
- } else
- row--;
-
- list->textptr = list->textptr->prev_entry;
- }
+ tx_scroll_listbox(list, SCROLLDOWN, 1);
break;
case KEY_DOWN:
- if (list->textptr->next_entry != NULL) {
- if (row == list->height - 3) {
- scrollok(list->win, 1);
- wscrl(list->win, 1);
- scrollok(list->win, 0);
- } else
- row++;
-
- list->textptr = list->textptr->next_entry;
- }
+ tx_scroll_listbox(list, SCROLLUP, 1);
+ break;
+ case KEY_PPAGE:
+ tx_scroll_listbox(list, SCROLLDOWN, list->height - 2);
+ break;
+ case KEY_NPAGE:
+ tx_scroll_listbox(list, SCROLLUP, list->height - 2);
+ break;
+ case KEY_HOME:
+ tx_scroll_listbox(list, SCROLLDOWN, INT_MAX);
+ break;
+ case KEY_END:
+ tx_scroll_listbox(list, SCROLLUP, INT_MAX);
break;
case 13:
*aborted = 0;
diff --git a/src/tui/listbox.h b/src/tui/listbox.h
index 4b74a25..510bbf1 100644
--- a/src/tui/listbox.h
+++ b/src/tui/listbox.h
@@ -19,6 +19,7 @@ struct scroll_list {
int mainattr;
int selectattr;
int keyattr;
+ int row;
WINDOW *win;
PANEL *panel;
--
1.7.8.4
2:01 p.m.
New subject: [PATCH 07/12] tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
Vitezslav Samel <vitezslav(a)samel.cz> writes:
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/listbox.c | 99 ++++++++++++++++++++++++++++++++++++-----------------
src/tui/listbox.h | 1 +
2 files changed, 68 insertions(+), 32 deletions(-)
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index 2a3faa3..bb30ca1 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -12,6 +12,9 @@
+ case KEY_HOME:
+ tx_scroll_listbox(list, SCROLLDOWN, INT_MAX);
+ break;
+ case KEY_END:
+ tx_scroll_listbox(list, SCROLLUP, INT_MAX);
src/tui/listbox.c: In function ‘tx_operate_listbox’:
src/tui/listbox.c:164: error: ‘INT_MAX’ undeclared (first use in this function)
src/tui/listbox.c:164: error: (Each undeclared identifier is reported only once
src/tui/listbox.c:164: error: for each function it appears in.)
make: *** [src/tui/listbox.o] Error 1
and
src/ifstats.c: In function ‘ifstats’:
src/ifstats.c:557: error: ‘INT_MAX’ undeclared (first use in this function)
src/ifstats.c:557: error: (Each undeclared identifier is reported only once
src/ifstats.c:557: error: for each function it appears in.)
make: *** [src/ifstats.o] Error 1
you haven't included limits.h ;) so I will fold into this patch
following lines, ok?
diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
index f17a686..aaa2807 100644
--- a/src/iptraf-ng-compat.h
+++ b/src/iptraf-ng-compat.h
@@ -17,6 +17,7 @@
#include <assert.h>
#include <stddef.h>
#include <poll.h>
+#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
--
Nikola
12:30 a.m.
New subject: [PATCH 07/12] tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
On Thu, Aug 08, 2013 at 09:01:24PM +0200, Nikola Pajkovsky wrote:
Vitezslav Samel <vitezslav(a)samel.cz> writes:
> Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
> ---
> src/tui/listbox.c | 99 ++++++++++++++++++++++++++++++++++++-----------------
> src/tui/listbox.h | 1 +
> 2 files changed, 68 insertions(+), 32 deletions(-)
>
> diff --git a/src/tui/listbox.c b/src/tui/listbox.c
> index 2a3faa3..bb30ca1 100644
> --- a/src/tui/listbox.c
> +++ b/src/tui/listbox.c
> @@ -12,6 +12,9 @@
> + case KEY_HOME:
> + tx_scroll_listbox(list, SCROLLDOWN, INT_MAX);
> + break;
> + case KEY_END:
> + tx_scroll_listbox(list, SCROLLUP, INT_MAX);
src/tui/listbox.c: In function ‘tx_operate_listbox’:
src/tui/listbox.c:164: error: ‘INT_MAX’ undeclared (first use in this function)
src/tui/listbox.c:164: error: (Each undeclared identifier is reported only once
src/tui/listbox.c:164: error: for each function it appears in.)
make: *** [src/tui/listbox.o] Error 1
and
src/ifstats.c: In function ‘ifstats’:
src/ifstats.c:557: error: ‘INT_MAX’ undeclared (first use in this function)
src/ifstats.c:557: error: (Each undeclared identifier is reported only once
src/ifstats.c:557: error: for each function it appears in.)
make: *** [src/ifstats.o] Error 1
you haven't included limits.h ;) so I will fold into this patch
following lines, ok?
OK.
Vita
diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
index f17a686..aaa2807 100644
--- a/src/iptraf-ng-compat.h
+++ b/src/iptraf-ng-compat.h
@@ -17,6 +17,7 @@
#include <assert.h>
#include <stddef.h>
#include <poll.h>
+#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
--
Nikola
7:04 a.m.
New subject: [PATCH 07/12] tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
Vitezslav Samel <vitezslav(a)samel.cz> writes:
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/listbox.c | 99 ++++++++++++++++++++++++++++++++++++-----------------
src/tui/listbox.h | 1 +
2 files changed, 68 insertions(+), 32 deletions(-)
I was trying use this feature after running
$ iptraf-ng -i eth0
switch to lower window (w)
I could not use Home and End
--
Nikola
7:28 a.m.
New subject: [PATCH 07/12] tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
On Fri, Aug 09, 2013 at 02:04:35PM +0200, Nikola Pajkovsky wrote:
Vitezslav Samel <vitezslav(a)samel.cz> writes:
> Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
> ---
> src/tui/listbox.c | 99 ++++++++++++++++++++++++++++++++++++-----------------
> src/tui/listbox.h | 1 +
> 2 files changed, 68 insertions(+), 32 deletions(-)
I was trying use this feature after running
$ iptraf-ng -i eth0
switch to lower window (w)
I could not use Home and End
Listboxes are created and used only for interface selection (in ifstats.c),
filter seletion (in fltmgr.c), eth descriptions (landesc.c) and port
selection (in serv.c).
All other windows must be changed specifically in their code. I'm
working on this.
Vita
8:17 a.m.
New subject: [PATCH 07/12] tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
Vitezslav Samel <vitezslav(a)samel.cz> writes:
On Fri, Aug 09, 2013 at 02:04:35PM +0200, Nikola Pajkovsky wrote:
> Vitezslav Samel <vitezslav(a)samel.cz> writes:
>
> > Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
> > ---
> > src/tui/listbox.c | 99 ++++++++++++++++++++++++++++++++++++-----------------
> > src/tui/listbox.h | 1 +
> > 2 files changed, 68 insertions(+), 32 deletions(-)
>
> I was trying use this feature after running
>
> $ iptraf-ng -i eth0
> switch to lower window (w)
>
> I could not use Home and End
Listboxes are created and used only for interface selection (in ifstats.c),
filter seletion (in fltmgr.c), eth descriptions (landesc.c) and port
selection (in serv.c).
All other windows must be changed specifically in their code. I'm
working on this.
working on unifying all windows to use listbox?
--
Nikola
2:50 a.m.
New subject: [PATCH 07/12] tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
On Fri, Aug 09, 2013 at 03:17:18PM +0200, Nikola Pajkovsky wrote:
Vitezslav Samel <vitezslav(a)samel.cz> writes:
> On Fri, Aug 09, 2013 at 02:04:35PM +0200, Nikola Pajkovsky wrote:
>> Vitezslav Samel <vitezslav(a)samel.cz> writes:
>>
>> > Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
>> > ---
>> > src/tui/listbox.c | 99
++++++++++++++++++++++++++++++++++++-----------------
>> > src/tui/listbox.h | 1 +
>> > 2 files changed, 68 insertions(+), 32 deletions(-)
>>
>> I was trying use this feature after running
>>
>> $ iptraf-ng -i eth0
>> switch to lower window (w)
>>
>> I could not use Home and End
>
> Listboxes are created and used only for interface selection (in ifstats.c),
> filter seletion (in fltmgr.c), eth descriptions (landesc.c) and port
> selection (in serv.c).
> All other windows must be changed specifically in their code. I'm
> working on this.
working on unifying all windows to use listbox?
No, because listboxes are prepared to do the job of selection of
static texts, but the other windows change their contents dynamicly.
Maybe the unifying of these windows into something common may be done,
need to think of it.
Vita
8:22 a.m.
New subject: [PATCH 08/12] tui/listbox.c: simplify tx_destroy_list()
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tui/listbox.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/tui/listbox.c b/src/tui/listbox.c
index bb30ca1..48ac573 100644
--- a/src/tui/listbox.c
+++ b/src/tui/listbox.c
@@ -217,15 +217,9 @@ void tx_destroy_list(struct scroll_list *list)
struct textlisttype *ttmp = list->textlist;
struct textlisttype *ctmp;
- if (ttmp != NULL) {
+ while (ttmp != NULL) {
ctmp = ttmp->next_entry;
-
- while (ttmp != NULL) {
- free(ttmp);
- ttmp = ctmp;
-
- if (ctmp != NULL)
- ctmp = ctmp->next_entry;
- }
+ free(ttmp);
+ ttmp = ctmp;
}
}
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 09/12] ifstats.c: reduce params to printifentry()
idx param is always set to table->firstvisible->index so we could
dereference it in printifentry() and thus kill this parameter
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/ifstats.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/ifstats.c b/src/ifstats.c
index 8e15979..e6f7932 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -288,15 +288,14 @@ static void showrates(struct iftab *table)
} while (ptmp != table->lastvisible->next_entry);
}
-static void printifentry(struct iflist *ptmp, WINDOW * win, unsigned int idx)
+static void printifentry(struct iftab *table, struct iflist *ptmp)
{
- unsigned int target_row;
+ int target_row = ptmp->index - table->firstvisible->index;
+ WINDOW *win = table->statwin;
- if ((ptmp->index < idx) || (ptmp->index > idx + (LINES - 5)))
+ if ((target_row < 0) || (target_row > LINES - 5))
return;
- target_row = ptmp->index - idx;
-
wattrset(win, STDATTR);
mvwprintw(win, target_row, 1, "%s", ptmp->ifname);
wattrset(win, HIGHATTR);
@@ -320,7 +319,7 @@ static void print_if_entries(struct iftab *table)
unsigned int winht = LINES - 4;
do {
- printifentry(ptmp, table->statwin, table->firstvisible->index);
+ printifentry(table, ptmp);
if (i <= winht)
table->lastvisible = ptmp;
@@ -382,8 +381,7 @@ static void scrollgstatwin(struct iftab *table, int direction)
scrollok(table->statwin, 0);
mvwprintw(table->statwin, LINES - 5, 0, "%*c", COLS - 2, ' ');
scrollok(table->statwin, 1);
- printifentry(table->lastvisible, table->statwin,
- table->firstvisible->index);
+ printifentry(table, table->lastvisible);
}
} else {
if (table->firstvisible != table->head) {
@@ -391,8 +389,7 @@ static void scrollgstatwin(struct iftab *table, int direction)
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
mvwprintw(table->statwin, 0, 0, "%*c", COLS - 2, ' ');
- printifentry(table->firstvisible, table->statwin,
- table->firstvisible->index);
+ printifentry(table, table->firstvisible);
}
}
}
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 10/12] ifstats.c: allow scrolling with Home, End, PageUp and PageDown keys
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/ifstats.c | 58 ++++++++++++++++++++++++++++----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/ifstats.c b/src/ifstats.c
index e6f7932..bba6afc 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -370,49 +370,43 @@ static void initiftab(struct iftab *table)
* Scrolling routines for the general interface statistics window
*/
-static void scrollgstatwin(struct iftab *table, int direction)
+static void scrollgstatwin(struct iftab *table, int direction, int lines)
{
+ if (lines < 1)
+ return;
+
wattrset(table->statwin, STDATTR);
if (direction == SCROLLUP) {
- if (table->lastvisible->next_entry != NULL) {
- wscrl(table->statwin, 1);
- table->lastvisible = table->lastvisible->next_entry;
+ for (int i = 0; i < lines; i++) {
+ if (table->lastvisible->next_entry == NULL)
+ break;
+
table->firstvisible = table->firstvisible->next_entry;
+ table->lastvisible = table->lastvisible->next_entry;
+
+ wscrl(table->statwin, 1);
scrollok(table->statwin, 0);
mvwprintw(table->statwin, LINES - 5, 0, "%*c", COLS - 2, ' ');
scrollok(table->statwin, 1);
+
printifentry(table, table->lastvisible);
}
} else {
- if (table->firstvisible != table->head) {
- wscrl(table->statwin, -1);
+ for (int i = 0; i < lines; i++) {
+ if (table->firstvisible == table->head)
+ break;
+
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
- mvwprintw(table->statwin, 0, 0, "%*c", COLS - 2, ' ');
- printifentry(table, table->firstvisible);
- }
- }
-}
-static void pagegstatwin(struct iftab *table, int direction)
-{
- int i = 1;
+ wscrl(table->statwin, -1);
+ mvwprintw(table->statwin, 0, 0, "%*c", COLS - 2, ' ');
- if (direction == SCROLLUP) {
- while ((i <= LINES - 5)
- && (table->lastvisible->next_entry != NULL)) {
- i++;
- scrollgstatwin(table, direction);
- }
- } else {
- while ((i <= LINES - 5) && (table->firstvisible != table->head)) {
- i++;
- scrollgstatwin(table, direction);
+ printifentry(table, table->firstvisible);
}
}
}
-
/*
* The general interface statistics function
*/
@@ -544,18 +538,24 @@ void ifstats(time_t facilitytime)
/* no key ready, do nothing */
break;
case KEY_UP:
- scrollgstatwin(&table, SCROLLDOWN);
+ scrollgstatwin(&table, SCROLLDOWN, 1);
break;
case KEY_DOWN:
- scrollgstatwin(&table, SCROLLUP);
+ scrollgstatwin(&table, SCROLLUP, 1);
break;
case KEY_PPAGE:
case '-':
- pagegstatwin(&table, SCROLLDOWN);
+ scrollgstatwin(&table, SCROLLDOWN, LINES - 5);
break;
case KEY_NPAGE:
case ' ':
- pagegstatwin(&table, SCROLLUP);
+ scrollgstatwin(&table, SCROLLUP, LINES - 5);
+ break;
+ case KEY_HOME:
+ scrollgstatwin(&table, SCROLLDOWN, INT_MAX);
+ break;
+ case KEY_END:
+ scrollgstatwin(&table, SCROLLUP, INT_MAX);
break;
case 12:
case 'l':
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 11/12] ifstats.c: call showrates() right after starting or scrolling the view
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/ifstats.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/ifstats.c b/src/ifstats.c
index bba6afc..479c243 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -405,6 +405,7 @@ static void scrollgstatwin(struct iftab *table, int direction, int
lines)
printifentry(table, table->firstvisible);
}
}
+ showrates(table);
}
/*
@@ -473,6 +474,7 @@ void ifstats(time_t facilitytime)
table.firstvisible = table.head;
print_if_entries(&table);
+ showrates(&table);
update_panels();
doupdate();
--
1.7.8.4
8:22 a.m.
New subject: [PATCH 12/12] detstats.c: print broadcasts the same way as other protocols
add broadcast line under the Non-IP line and instead of the former
broadcast lines print broadcast rates.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/detstats.c | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/src/detstats.c b/src/detstats.c
index 37c43bb..5783fd6 100644
--- a/src/detstats.c
+++ b/src/detstats.c
@@ -30,11 +30,11 @@ detstats.c - the interface statistics module
struct ifcounts {
struct proto_counter total;
- struct pkt_counter bcast;
struct pkt_counter bad;
struct proto_counter ipv4;
struct proto_counter ipv6;
struct proto_counter nonip;
+ struct proto_counter bcast;
struct proto_counter tcp;
struct proto_counter udp;
@@ -128,8 +128,8 @@ static void writedstatlog(char *ifname,
ts->nonip.proto_out.pc_packets,
ts->nonip.proto_out.pc_bytes);
fprintf(fd, "Broadcast: %llu packets, %llu bytes\n",
- ts->bcast.pc_packets,
- ts->bcast.pc_bytes);
+ ts->bcast.proto_total.pc_packets,
+ ts->bcast.proto_total.pc_bytes);
if (nsecs > 5) {
char bps_string[64];
@@ -177,12 +177,12 @@ static void printdetlabels(WINDOW * win)
mvwprintw(win, 9, 2, "ICMP:");
mvwprintw(win, 10, 2, "Other IP:");
mvwprintw(win, 11, 2, "Non-IP:");
+ mvwprintw(win, 12, 2, "Broadcast:");
mvwprintw(win, 14, 2, "Total rates:");
mvwprintw(win, 17, 2, "Incoming rates:");
mvwprintw(win, 20, 2, "Outgoing rates:");
- mvwprintw(win, 14, 45, "Broadcast packets:");
- mvwprintw(win, 15, 45, "Broadcast bytes:");
+ mvwprintw(win, 14, 45, "Broadcast rates:");
mvwprintw(win, 19, 45, "IP checksum errors:");
update_panels();
@@ -232,18 +232,15 @@ static void printdetails(struct ifcounts *ifcounts, WINDOW * win)
printstatrow_proto(win, 10, &ifcounts->other);
/* Print non-IP totals */
-
printstatrow_proto(win, 11, &ifcounts->nonip);
- /* Broadcast totals */
- wmove(win, 14, 67);
- printlargenum(ifcounts->bcast.pc_packets, win);
- wmove(win, 15, 67);
- printlargenum(ifcounts->bcast.pc_bytes, win);
+ /* Print broadcast totals */
+ printstatrow_proto(win, 12, &ifcounts->bcast);
+
/* Bad packet count */
- mvwprintw(win, 19, 68, "%8lu", ifcounts->bad.pc_packets);
+ mvwprintw(win, 19, 65, "%8lu", ifcounts->bad.pc_packets);
}
/*
@@ -275,10 +272,12 @@ void detstats(char *iface, time_t facilitytime)
time_t startlog;
struct proto_counter span;
+ struct pkt_counter span_bcast;
struct rate rate;
struct rate rate_in;
struct rate rate_out;
+ struct rate rate_bcast;
unsigned long peakactivity = 0;
unsigned long peakactivity_in = 0;
unsigned long peakactivity_out = 0;
@@ -286,6 +285,7 @@ void detstats(char *iface, time_t facilitytime)
struct rate pps_rate;
struct rate pps_rate_in;
struct rate pps_rate_out;
+ struct rate pps_rate_bcast;
unsigned long peakpps = 0;
unsigned long peakpps_in = 0;
unsigned long peakpps_out = 0;
@@ -350,13 +350,16 @@ void detstats(char *iface, time_t facilitytime)
doupdate();
memset(&span, 0, sizeof(span));
+ memset(&span_bcast, 0, sizeof(span_bcast));
rate_alloc(&rate, 5);
rate_alloc(&rate_in, 5);
rate_alloc(&rate_out, 5);
+ rate_alloc(&rate_bcast, 5);
rate_alloc(&pps_rate, 5);
rate_alloc(&pps_rate_in, 5);
rate_alloc(&pps_rate_out, 5);
+ rate_alloc(&pps_rate_bcast, 5);
gettimeofday(&tv, NULL);
start_tv = tv;
@@ -390,7 +393,9 @@ void detstats(char *iface, time_t facilitytime)
if ((now - starttime) >= 1) {
char buf[64];
unsigned long activity, activity_in, activity_out;
+ unsigned long activity_bcast;
unsigned long pps, pps_in, pps_out;
+ unsigned long pps_bcast;
unsigned long msecs;
wattrset(statwin, BOXATTR);
@@ -404,6 +409,8 @@ void detstats(char *iface, time_t facilitytime)
activity_in = rate_get_average(&rate_in);
rate_add_rate(&rate_out, span.proto_out.pc_bytes, msecs);
activity_out = rate_get_average(&rate_out);
+ rate_add_rate(&rate_bcast, span_bcast.pc_bytes, msecs);
+ activity_bcast = rate_get_average(&rate_bcast);
rate_add_rate(&pps_rate, span.proto_total.pc_packets, msecs);
pps = rate_get_average(&pps_rate);
@@ -411,8 +418,11 @@ void detstats(char *iface, time_t facilitytime)
pps_in = rate_get_average(&pps_rate_in);
rate_add_rate(&pps_rate_out, span.proto_out.pc_packets, msecs);
pps_out = rate_get_average(&pps_rate_out);
+ rate_add_rate(&pps_rate_bcast, span_bcast.pc_packets, msecs);
+ pps_bcast = rate_get_average(&pps_rate_bcast);
memset(&span, 0, sizeof(span));
+ memset(&span_bcast, 0, sizeof(span_bcast));
starttime = now;
start_tv = tv;
@@ -429,6 +439,10 @@ void detstats(char *iface, time_t facilitytime)
mvwprintw(statwin, 20, 19, "%s", buf);
rate_print_pps(pps_out, buf, sizeof(buf));
mvwprintw(statwin, 21, 19, "%s", buf);
+ rate_print(activity_bcast, buf, sizeof(buf));
+ mvwprintw(statwin, 14, 64, "%s", buf);
+ rate_print_pps(pps_bcast, buf, sizeof(buf));
+ mvwprintw(statwin, 15, 64, "%s", buf);
if (activity > peakactivity)
peakactivity = activity;
@@ -516,7 +530,8 @@ void detstats(char *iface, time_t facilitytime)
outgoing = (pkt.pkt_pkttype == PACKET_OUTGOING);
update_proto_counter(&ifcounts.total, outgoing, pkt.pkt_len);
if (pkt.pkt_pkttype == PACKET_BROADCAST) {
- update_pkt_counter(&ifcounts.bcast, pkt.pkt_len);
+ update_proto_counter(&ifcounts.bcast, outgoing, pkt.pkt_len);
+ update_pkt_counter(&span_bcast, pkt.pkt_len);
}
update_proto_counter(&span, outgoing, pkt.pkt_len);
@@ -567,10 +582,12 @@ err_close:
close(fd);
err:
+ rate_destroy(&pps_rate_bcast);
rate_destroy(&pps_rate_out);
rate_destroy(&pps_rate_in);
rate_destroy(&pps_rate);
+ rate_destroy(&rate_bcast);
rate_destroy(&rate_out);
rate_destroy(&rate_in);
rate_destroy(&rate);
--
1.7.8.4
7:10 a.m.
Vitezslav Samel <vitezslav(a)samel.cz> writes:
Vitezslav Samel (12):
use printw(win, "%*c", len, ' ') to print len spaces
use mvwprintw() instead of wmove()/wprintw() combo
tui/input.c: fix open coded padding printing
tx_operate_listbox(): remove unused keystroke parameter
tui/listbox.c: tx_operate_listbox(): remove unneeded check
tui/listbox.h: remove unused struct members
tui/listbox.c: allow scrolling listboxes with Home, End, PageUp and PageDown keys
tui/listbox.c: simplify tx_destroy_list()
ifstats.c: reduce params to printifentry()
ifstats.c: allow scrolling with Home, End, PageUp and PageDown keys
ifstats.c: call showrates() right after starting or scrolling the view
detstats.c: print broadcasts the same way as other protocols
src/deskman.c | 13 ++----
src/detstats.c | 43 ++++++++++++-----
src/fltmgr.c | 3 +-
src/hostmon.c | 53 +++++++--------------
src/ifstats.c | 111 +++++++++++++++++++--------------------------
src/itrafmon.c | 16 ++-----
src/landesc.c | 9 +---
src/options.c | 3 +-
src/othptab.c | 8 +---
src/pktsize.c | 9 +---
src/serv.c | 45 +++++-------------
src/tcptable.c | 30 ++++--------
src/timer.c | 3 +-
src/tui/input.c | 14 +-----
src/tui/listbox.c | 126 +++++++++++++++++++++++++++++-----------------------
src/tui/listbox.h | 9 +---
src/tui/menurt.c | 3 +-
src/tui/msgboxes.c | 3 +-
src/tui/winops.c | 7 +--
19 files changed, 218 insertions(+), 290 deletions(-)
all applied, thanks.
--
Nikola
3902
days inactive
3908
days old
iptraf-ng@lists.fedorahosted.org
19 comments
2 participants
participants (2)
-
Nikola Pajkovsky -
Vitezslav Samel