8:05 a.m.
Vitezslav Samel (20):
ipmon(): remove screen_idx variable
ipmon(): remove baridx variable
ipmon(): move mode variable into struct tcptable
ipmon(): no need to redraw sort win
itrafmon.c: refactor TCP screen scrolling
othptab.c: use struct in_addr for IPv4 address
ipmon(): move dropped packets count
itrafmon.c: refactor other packet screen scrolling
ipmon(): allow scrolling with Home, End keys
tcptable.c: simplify destroy_closed_entries()
tcptable.c: simplify destroytcptable()
struct tcptablent: kill unused starttime variable
updateentry(): rename transpacket variable to tcp
ipmon(): move statwin nad statpanel variables into struct tcptable
ipmon(): move NULL check into print_flowrate()
move_tcp_bar(): print flow rate after moving the bar
itrafmon.c: rename update_flowrate() to update_flowrates()
ipmon(): optimize: move some checks away from the hot path
ipmon(): refactor various time computing
ipmon(): simplify timeouted TCP entries handling
src/itrafmon.c | 575 +++++++++++++++++++++++++--------------------------------
src/othptab.c | 26 +--
src/othptab.h | 4 +-
src/tcptable.c | 268 ++++++++++++---------------
src/tcptable.h | 24 +--
5 files changed, 394 insertions(+), 503 deletions(-)
--
1.8.4
8:05 a.m.
New subject: [PATCH 01/20] ipmon(): remove screen_idx variable
There is no point to maintain screen_idx variable: its value follows
the value of table->firstvisible->index variable. Kill this variable
in ipmon() and fix all the places which used it.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 76 ++++++++++++++++++++++------------------------------------
src/tcptable.c | 43 ++++++++++++++++-----------------
src/tcptable.h | 10 ++++----
3 files changed, 54 insertions(+), 75 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index d6360a1..458c674 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -113,8 +113,7 @@ static void show_stats(WINDOW * win, unsigned long long total)
* Scrolling and paging routines for the upper (TCP) window
*/
-static void scrollupperwin(struct tcptable *table, int direction,
- unsigned long *idx, int mode)
+static void scrollupperwin(struct tcptable *table, int direction, int mode)
{
wattrset(table->tcpscreen, STDATTR);
if (direction == SCROLLUP) {
@@ -122,27 +121,24 @@ static void scrollupperwin(struct tcptable *table, int direction,
wscrl(table->tcpscreen, 1);
table->lastvisible = table->lastvisible->next_entry;
table->firstvisible = table->firstvisible->next_entry;
- (*idx)++;
wmove(table->tcpscreen, table->imaxy - 1, 0);
scrollok(table->tcpscreen, 0);
wprintw(table->tcpscreen, "%*c", COLS - 2, ' ');
scrollok(table->tcpscreen, 1);
- printentry(table, table->lastvisible, *idx, mode);
+ printentry(table, table->lastvisible, mode);
}
} else {
if (table->firstvisible != table->head) {
wscrl(table->tcpscreen, -1);
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
- (*idx)--;
mvwprintw(table->tcpscreen, 0, 0, "%*c", COLS - 2, ' ');
- printentry(table, table->firstvisible, *idx, mode);
+ printentry(table, table->firstvisible, mode);
}
}
}
-static void pageupperwin(struct tcptable *table, int direction,
- unsigned long *idx)
+static void pageupperwin(struct tcptable *table, int direction)
{
unsigned int i = 1;
@@ -153,7 +149,6 @@ static void pageupperwin(struct tcptable *table, int direction,
i++;
table->firstvisible = table->firstvisible->next_entry;
table->lastvisible = table->lastvisible->next_entry;
- (*idx)++;
}
} else {
while ((i <= table->imaxy - 3)
@@ -161,7 +156,6 @@ static void pageupperwin(struct tcptable *table, int direction,
i++;
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
- (*idx)--;
}
}
}
@@ -434,8 +428,8 @@ static void quicksort_tcp_entries(struct tcptable *table,
* replaced with a Quicksort algorithm.
*/
-static void sortipents(struct tcptable *table, unsigned long *idx, int ch,
- int logging, FILE *logfile)
+static void sortipents(struct tcptable *table, int ch, int logging,
+ FILE *logfile)
{
if ((table->head == NULL)
|| (table->head->next_entry->next_entry == NULL))
@@ -451,7 +445,6 @@ static void sortipents(struct tcptable *table, unsigned long *idx, int
ch,
table->firstvisible = table->head;
struct tcptableent *ptmp = table->head;
- *idx = 1;
while (ptmp && ((int)ptmp->index <= getmaxy(table->tcpscreen))) {
table->lastvisible = ptmp;
@@ -535,8 +528,6 @@ void ipmon(time_t facilitytime, char *ifptr)
in_port_t sport = 0, dport = 0; /* TCP/UDP port values */
- unsigned long screen_idx = 1;
-
struct timeval tv;
struct timeval tv_rate;
time_t starttime = 0;
@@ -707,9 +698,8 @@ void ipmon(time_t facilitytime, char *ifptr)
if ((options.closedint != 0)
&& ((now - closedint) / 60 >= options.closedint)) {
- flushclosedentries(&table, &screen_idx, logging,
- logfile);
- refreshtcpwin(&table, screen_idx, mode);
+ flushclosedentries(&table, logging, logfile);
+ refreshtcpwin(&table, mode);
closedint = now;
}
@@ -787,16 +777,14 @@ void ipmon(time_t facilitytime, char *ifptr)
tmptcp = table.barptr;
table.barptr = table.barptr->prev_entry;
- printentry(&table, tmptcp, screen_idx, mode);
+ printentry(&table, tmptcp, mode);
if (table.baridx == 1)
- scrollupperwin(&table, SCROLLDOWN,
- &screen_idx, mode);
+ scrollupperwin(&table, SCROLLDOWN, mode);
else
(table.baridx)--;
- printentry(&table, table.barptr, screen_idx,
- mode);
+ printentry(&table, table.barptr, mode);
break;
case KEY_DOWN:
if (curwin) {
@@ -809,16 +797,14 @@ void ipmon(time_t facilitytime, char *ifptr)
tmptcp = table.barptr;
table.barptr = table.barptr->next_entry;
- printentry(&table, tmptcp, screen_idx,mode);
+ printentry(&table, tmptcp, mode);
if (table.baridx == table.imaxy)
- scrollupperwin(&table, SCROLLUP,
- &screen_idx, mode);
+ scrollupperwin(&table, SCROLLUP, mode);
else
(table.baridx)++;
- printentry(&table,table.barptr, screen_idx,
- mode);
+ printentry(&table,table.barptr, mode);
break;
case KEY_RIGHT:
if (!curwin)
@@ -849,11 +835,11 @@ void ipmon(time_t facilitytime, char *ifptr)
if (!table.barptr)
break;
- pageupperwin(&table, SCROLLDOWN, &screen_idx);
+ pageupperwin(&table, SCROLLDOWN);
table.barptr = table.lastvisible;
table.baridx = table.lastvisible->index
- - screen_idx + 1;
- refreshtcpwin(&table, screen_idx, mode);
+ - table.firstvisible->index + 1;
+ refreshtcpwin(&table, mode);
break;
case KEY_NPAGE:
case ' ':
@@ -866,10 +852,10 @@ void ipmon(time_t facilitytime, char *ifptr)
if (!table.barptr)
break;
- pageupperwin(&table, SCROLLUP, &screen_idx);
+ pageupperwin(&table, SCROLLUP);
table.barptr = table.firstvisible;
table.baridx = 1;
- refreshtcpwin(&table, screen_idx, mode);
+ refreshtcpwin(&table, mode);
break;
case KEY_F(6):
case 'w':
@@ -887,7 +873,7 @@ void ipmon(time_t facilitytime, char *ifptr)
mode = (mode + 1) % 3;
if ((mode == 1) && !options.mac)
mode = 2;
- refreshtcpwin(&table, screen_idx, mode);
+ refreshtcpwin(&table, mode);
break;
case 12:
case 'l':
@@ -899,9 +885,8 @@ void ipmon(time_t facilitytime, char *ifptr)
case 'f':
case 'c':
case 'C':
- flushclosedentries(&table, &screen_idx, logging,
- logfile);
- refreshtcpwin(&table, screen_idx, mode);
+ flushclosedentries(&table, logging, logfile);
+ refreshtcpwin(&table, mode);
break;
case 's':
case 'S':
@@ -924,14 +909,13 @@ void ipmon(time_t facilitytime, char *ifptr)
show_sort_statwin(&sortwin, &sortpanel);
update_panels();
doupdate();
- sortipents(&table, &screen_idx, ch, logging,
- logfile);
+ sortipents(&table, ch, logging, logfile);
if (table.barptr != NULL) {
table.barptr = table.firstvisible;
table.baridx = 1;
}
- refreshtcpwin(&table, screen_idx, mode);
+ refreshtcpwin(&table, mode);
del_panel(sortpanel);
delwin(sortwin);
update_panels();
@@ -1011,8 +995,7 @@ void ipmon(time_t facilitytime, char *ifptr)
pkt_ip_protocol(&pkt),
ifname, &revlook, rvnfd);
if (tcpentry != NULL) {
- printentry(&table, tcpentry->oth_connection, screen_idx,
- mode);
+ printentry(&table, tcpentry->oth_connection, mode);
if (wasempty) {
table.barptr = table.firstvisible;
@@ -1071,11 +1054,10 @@ void ipmon(time_t facilitytime, char *ifptr)
&& (tcpentry->s_fstat == RESOLVED))
|| ((p_dstat != RESOLVED)
&& (tcpentry->d_fstat == RESOLVED)))) {
- clearaddr(&table, tcpentry, screen_idx);
- clearaddr(&table, tcpentry->oth_connection,
- screen_idx);
+ clearaddr(&table, tcpentry);
+ clearaddr(&table, tcpentry->oth_connection);
}
- printentry(&table, tcpentry, screen_idx, mode);
+ printentry(&table, tcpentry, mode);
/*
* Special cases: Update other direction if it's
@@ -1096,7 +1078,7 @@ void ipmon(time_t facilitytime, char *ifptr)
|| ((p_dstat != RESOLVED)
&& (tcpentry->d_fstat == RESOLVED)))))
printentry(&table, tcpentry->oth_connection,
- screen_idx, mode);
+ mode);
}
break; }
case IPPROTO_ICMP:
diff --git a/src/tcptable.c b/src/tcptable.c
index f9ef908..ee26a99 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -746,16 +746,15 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
* Returns immediately if the entry is not visible in the window.
*/
-void clearaddr(struct tcptable *table, struct tcptableent *tableentry,
- unsigned int screen_idx)
+void clearaddr(struct tcptable *table, struct tcptableent *tableentry)
{
unsigned int target_row;
- if ((tableentry->index < screen_idx)
- || (tableentry->index > screen_idx + (table->imaxy - 1)))
+ if ((tableentry->index < table->firstvisible->index)
+ || (tableentry->index > table->lastvisible->index))
return;
- target_row = (tableentry->index) - screen_idx;
+ target_row = tableentry->index - table->firstvisible->index;
mvwprintw(table->tcpscreen, target_row, 1, "%44c", ' ');
}
@@ -766,7 +765,7 @@ void clearaddr(struct tcptable *table, struct tcptableent
*tableentry,
*/
void printentry(struct tcptable *table, struct tcptableent *tableentry,
- unsigned int screen_idx, int mode)
+ int mode)
{
char stat[7] = "";
unsigned int target_row;
@@ -786,11 +785,11 @@ void printentry(struct tcptable *table, struct tcptableent
*tableentry,
highattr = HIGHATTR;
}
- if ((tableentry->index < screen_idx)
- || (tableentry->index > screen_idx + (table->imaxy - 1)))
+ if ((tableentry->index < table->firstvisible->index)
+ || (tableentry->index > table->lastvisible->index))
return;
- target_row = (tableentry->index) - screen_idx;
+ target_row = tableentry->index - table->firstvisible->index;
/* clear the data if it's a reused entry */
@@ -877,7 +876,7 @@ void printentry(struct tcptable *table, struct tcptableent
*tableentry,
* Redraw the TCP window
*/
-void refreshtcpwin(struct tcptable *table, unsigned int idx, int mode)
+void refreshtcpwin(struct tcptable *table, int mode)
{
struct tcptableent *ptmp;
@@ -887,7 +886,7 @@ void refreshtcpwin(struct tcptable *table, unsigned int idx, int
mode)
ptmp = table->firstvisible;
while ((ptmp != NULL) && (ptmp->prev_entry != table->lastvisible)) {
- printentry(table, ptmp, idx, mode);
+ printentry(table, ptmp, mode);
ptmp = ptmp->next_entry;
}
@@ -1006,12 +1005,12 @@ static void destroy_tcp_entry(struct tcptable *table, struct
tcptableent *ptmp)
* entries.
*/
-void flushclosedentries(struct tcptable *table, unsigned long *screen_idx,
- int logging, FILE *logfile)
+void flushclosedentries(struct tcptable *table, int logging, FILE *logfile)
{
struct tcptableent *ptmp = table->head;
struct tcptableent *ctmp = NULL;
unsigned long idx = 1;
+ unsigned long screen_idx = table->firstvisible->index;
time_t now;
time_t lastupdated = 0;
@@ -1064,21 +1063,21 @@ void flushclosedentries(struct tcptable *table, unsigned long
*screen_idx,
* Adjust screen index if the deleted entry was "above"
* the screen.
*/
- if (idx < *screen_idx)
- (*screen_idx)--;
+ if (idx < screen_idx)
+ screen_idx--;
} else {
/*
* Set the first visible pointer once the index matches
* the screen index.
*/
- if (idx == *screen_idx)
+ if (idx == screen_idx)
table->firstvisible = ptmp;
/*
* Keep setting the last visible pointer until the scan
* index "leaves" the screen
*/
- if (idx <= (*screen_idx) + (table->imaxy - 1))
+ if (idx <= screen_idx + (table->imaxy - 1))
table->lastvisible = ptmp;
ptmp->index = idx;
@@ -1103,8 +1102,8 @@ void flushclosedentries(struct tcptable *table, unsigned long
*screen_idx,
* "above" the screen index. Set the firstvisible pointer to that
* as well.
*/
- if (table->tail->index < *screen_idx) {
- *screen_idx = table->tail->index;
+ if (table->tail->index < screen_idx) {
+ screen_idx = table->tail->index;
table->firstvisible = table->tail;
}
@@ -1115,16 +1114,16 @@ void flushclosedentries(struct tcptable *table, unsigned long
*screen_idx,
* head of the table. The highlight bar should "go along" with
* the shifting.
*/
- while ((table->tail->index < *screen_idx + table->imaxy - 1)
+ while ((table->tail->index < screen_idx + table->imaxy - 1)
&& (table->firstvisible->prev_entry != NULL)) {
table->firstvisible = table->firstvisible->prev_entry;
- (*screen_idx)--;
+ screen_idx--;
}
/*
* Set the bar position index once everything's done.
*/
- table->baridx = table->barptr->index - *screen_idx + 1;
+ table->baridx = table->barptr->index - screen_idx + 1;
}
}
diff --git a/src/tcptable.h b/src/tcptable.h
index 85d39ec..06a1262 100644
--- a/src/tcptable.h
+++ b/src/tcptable.h
@@ -124,18 +124,16 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
void addtoclosedlist(struct tcptable *table, struct tcptableent *tableentry);
-void clearaddr(struct tcptable *table, struct tcptableent *tableentry,
- unsigned int screen_idx);
+void clearaddr(struct tcptable *table, struct tcptableent *tableentry);
void printentry(struct tcptable *table, struct tcptableent *tableentry,
- unsigned int screen_idx, int mode);
+ int mode);
-void refreshtcpwin(struct tcptable *table, unsigned int idx, int mode);
+void refreshtcpwin(struct tcptable *table, int mode);
void destroytcptable(struct tcptable *table);
-void flushclosedentries(struct tcptable *table, unsigned long *screen_idx,
- int logging, FILE *logfile);
+void flushclosedentries(struct tcptable *table, int logging, FILE *logfile);
void write_timeout_log(int logging, FILE *logfile, struct tcptableent *tcpnode);
--
1.8.4
8:05 a.m.
New subject: [PATCH 02/20] ipmon(): remove baridx variable
There is no point to maintain baridx variable: its two checks can be
transformed to checks of barptr variable against firstvisible or
lastvisible pointers.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 13 ++-----------
src/tcptable.c | 6 ------
src/tcptable.h | 1 -
3 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 458c674..d0385b9 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -779,10 +779,8 @@ void ipmon(time_t facilitytime, char *ifptr)
printentry(&table, tmptcp, mode);
- if (table.baridx == 1)
+ if (tmptcp == table.firstvisible)
scrollupperwin(&table, SCROLLDOWN, mode);
- else
- (table.baridx)--;
printentry(&table, table.barptr, mode);
break;
@@ -799,10 +797,8 @@ void ipmon(time_t facilitytime, char *ifptr)
table.barptr = table.barptr->next_entry;
printentry(&table, tmptcp, mode);
- if (table.baridx == table.imaxy)
+ if (tmptcp == table.lastvisible)
scrollupperwin(&table, SCROLLUP, mode);
- else
- (table.baridx)++;
printentry(&table,table.barptr, mode);
break;
@@ -837,8 +833,6 @@ void ipmon(time_t facilitytime, char *ifptr)
pageupperwin(&table, SCROLLDOWN);
table.barptr = table.lastvisible;
- table.baridx = table.lastvisible->index
- - table.firstvisible->index + 1;
refreshtcpwin(&table, mode);
break;
case KEY_NPAGE:
@@ -854,7 +848,6 @@ void ipmon(time_t facilitytime, char *ifptr)
pageupperwin(&table, SCROLLUP);
table.barptr = table.firstvisible;
- table.baridx = 1;
refreshtcpwin(&table, mode);
break;
case KEY_F(6):
@@ -913,7 +906,6 @@ void ipmon(time_t facilitytime, char *ifptr)
if (table.barptr != NULL) {
table.barptr = table.firstvisible;
- table.baridx = 1;
}
refreshtcpwin(&table, mode);
del_panel(sortpanel);
@@ -999,7 +991,6 @@ void ipmon(time_t facilitytime, char *ifptr)
if (wasempty) {
table.barptr = table.firstvisible;
- table.baridx = 1;
}
}
}
diff --git a/src/tcptable.c b/src/tcptable.c
index ee26a99..cb6413e 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -145,7 +145,6 @@ void init_tcp_table(struct tcptable *table)
table->hash_tails[i] = NULL;
}
table->barptr = NULL;
- table->baridx = 0;
}
/*
@@ -1119,11 +1118,6 @@ void flushclosedentries(struct tcptable *table, int logging, FILE
*logfile)
table->firstvisible = table->firstvisible->prev_entry;
screen_idx--;
}
-
- /*
- * Set the bar position index once everything's done.
- */
- table->baridx = table->barptr->index - screen_idx + 1;
}
}
diff --git a/src/tcptable.h b/src/tcptable.h
index 06a1262..20dadd1 100644
--- a/src/tcptable.h
+++ b/src/tcptable.h
@@ -91,7 +91,6 @@ struct tcptable {
struct tcptableent *firstvisible;
struct tcptableent *lastvisible;
struct tcptableent *barptr;
- unsigned int baridx;
unsigned int lastpos;
unsigned int count;
unsigned int bmaxy; /* number of lines of the border window */
--
1.8.4
8:05 a.m.
New subject: [PATCH 03/20] ipmon(): move mode variable into struct tcptable
... to reduce number of args of various functions.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 44 +++++++++++++++++++++-----------------------
src/tcptable.c | 12 ++++++------
src/tcptable.h | 6 +++---
3 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index d0385b9..3f8ef9c 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -113,7 +113,7 @@ static void show_stats(WINDOW * win, unsigned long long total)
* Scrolling and paging routines for the upper (TCP) window
*/
-static void scrollupperwin(struct tcptable *table, int direction, int mode)
+static void scrollupperwin(struct tcptable *table, int direction)
{
wattrset(table->tcpscreen, STDATTR);
if (direction == SCROLLUP) {
@@ -125,7 +125,7 @@ static void scrollupperwin(struct tcptable *table, int direction, int
mode)
scrollok(table->tcpscreen, 0);
wprintw(table->tcpscreen, "%*c", COLS - 2, ' ');
scrollok(table->tcpscreen, 1);
- printentry(table, table->lastvisible, mode);
+ printentry(table, table->lastvisible);
}
} else {
if (table->firstvisible != table->head) {
@@ -133,7 +133,7 @@ static void scrollupperwin(struct tcptable *table, int direction, int
mode)
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
mvwprintw(table->tcpscreen, 0, 0, "%*c", COLS - 2, ' ');
- printentry(table, table->firstvisible, mode);
+ printentry(table, table->firstvisible);
}
}
}
@@ -555,7 +555,6 @@ void ipmon(time_t facilitytime, char *ifptr)
struct tcptable table;
struct tcptableent *tcpentry;
struct tcptableent *tmptcp;
- int mode = 0;
struct othptable othptbl;
@@ -699,7 +698,7 @@ void ipmon(time_t facilitytime, char *ifptr)
if ((options.closedint != 0)
&& ((now - closedint) / 60 >= options.closedint)) {
flushclosedentries(&table, logging, logfile);
- refreshtcpwin(&table, mode);
+ refreshtcpwin(&table);
closedint = now;
}
@@ -777,12 +776,12 @@ void ipmon(time_t facilitytime, char *ifptr)
tmptcp = table.barptr;
table.barptr = table.barptr->prev_entry;
- printentry(&table, tmptcp, mode);
+ printentry(&table, tmptcp);
if (tmptcp == table.firstvisible)
- scrollupperwin(&table, SCROLLDOWN, mode);
+ scrollupperwin(&table, SCROLLDOWN);
- printentry(&table, table.barptr, mode);
+ printentry(&table, table.barptr);
break;
case KEY_DOWN:
if (curwin) {
@@ -795,12 +794,12 @@ void ipmon(time_t facilitytime, char *ifptr)
tmptcp = table.barptr;
table.barptr = table.barptr->next_entry;
- printentry(&table, tmptcp, mode);
+ printentry(&table, tmptcp);
if (tmptcp == table.lastvisible)
- scrollupperwin(&table, SCROLLUP, mode);
+ scrollupperwin(&table, SCROLLUP);
- printentry(&table,table.barptr, mode);
+ printentry(&table,table.barptr);
break;
case KEY_RIGHT:
if (!curwin)
@@ -833,7 +832,7 @@ void ipmon(time_t facilitytime, char *ifptr)
pageupperwin(&table, SCROLLDOWN);
table.barptr = table.lastvisible;
- refreshtcpwin(&table, mode);
+ refreshtcpwin(&table);
break;
case KEY_NPAGE:
case ' ':
@@ -848,7 +847,7 @@ void ipmon(time_t facilitytime, char *ifptr)
pageupperwin(&table, SCROLLUP);
table.barptr = table.firstvisible;
- refreshtcpwin(&table, mode);
+ refreshtcpwin(&table);
break;
case KEY_F(6):
case 'w':
@@ -863,10 +862,10 @@ void ipmon(time_t facilitytime, char *ifptr)
case 'M':
if (curwin)
break;
- mode = (mode + 1) % 3;
- if ((mode == 1) && !options.mac)
- mode = 2;
- refreshtcpwin(&table, mode);
+ table.mode = (table.mode + 1) % 3;
+ if ((table.mode == 1) && !options.mac)
+ table.mode = 2;
+ refreshtcpwin(&table);
break;
case 12:
case 'l':
@@ -879,7 +878,7 @@ void ipmon(time_t facilitytime, char *ifptr)
case 'c':
case 'C':
flushclosedentries(&table, logging, logfile);
- refreshtcpwin(&table, mode);
+ refreshtcpwin(&table);
break;
case 's':
case 'S':
@@ -907,7 +906,7 @@ void ipmon(time_t facilitytime, char *ifptr)
if (table.barptr != NULL) {
table.barptr = table.firstvisible;
}
- refreshtcpwin(&table, mode);
+ refreshtcpwin(&table);
del_panel(sortpanel);
delwin(sortwin);
update_panels();
@@ -987,7 +986,7 @@ void ipmon(time_t facilitytime, char *ifptr)
pkt_ip_protocol(&pkt),
ifname, &revlook, rvnfd);
if (tcpentry != NULL) {
- printentry(&table, tcpentry->oth_connection, mode);
+ printentry(&table, tcpentry->oth_connection);
if (wasempty) {
table.barptr = table.firstvisible;
@@ -1048,7 +1047,7 @@ void ipmon(time_t facilitytime, char *ifptr)
clearaddr(&table, tcpentry);
clearaddr(&table, tcpentry->oth_connection);
}
- printentry(&table, tcpentry, mode);
+ printentry(&table, tcpentry);
/*
* Special cases: Update other direction if it's
@@ -1068,8 +1067,7 @@ void ipmon(time_t facilitytime, char *ifptr)
&& (tcpentry->s_fstat == RESOLVED))
|| ((p_dstat != RESOLVED)
&& (tcpentry->d_fstat == RESOLVED)))))
- printentry(&table, tcpentry->oth_connection,
- mode);
+ printentry(&table, tcpentry->oth_connection);
}
break; }
case IPPROTO_ICMP:
diff --git a/src/tcptable.c b/src/tcptable.c
index cb6413e..5e5ee11 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -111,6 +111,7 @@ void init_tcp_table(struct tcptable *table)
mvwprintw(table->borderwin, 0, 1, " TCP Connections (Source Host:Port) ");
setlabels(table->borderwin, 0); /* initially use mode 0 */
+ table->mode = 0;
mvwprintw(table->borderwin, 0, 65 * COLS / 80, " Flag ");
mvwprintw(table->borderwin, 0, 70 * COLS / 80, " Iface ");
@@ -763,8 +764,7 @@ void clearaddr(struct tcptable *table, struct tcptableent
*tableentry)
* not visible in the window.
*/
-void printentry(struct tcptable *table, struct tcptableent *tableentry,
- int mode)
+void printentry(struct tcptable *table, struct tcptableent *tableentry)
{
char stat[7] = "";
unsigned int target_row;
@@ -824,7 +824,7 @@ void printentry(struct tcptable *table, struct tcptableent
*tableentry,
* on the value of mode.
*/
- switch (mode) {
+ switch (table->mode) {
case 0:
wmove(table->tcpscreen, target_row, 47 * COLS / 80 - 2);
if (tableentry->partial)
@@ -875,17 +875,17 @@ void printentry(struct tcptable *table, struct tcptableent
*tableentry,
* Redraw the TCP window
*/
-void refreshtcpwin(struct tcptable *table, int mode)
+void refreshtcpwin(struct tcptable *table)
{
struct tcptableent *ptmp;
- setlabels(table->borderwin, mode);
+ setlabels(table->borderwin, table->mode);
wattrset(table->tcpscreen, STDATTR);
tx_colorwin(table->tcpscreen);
ptmp = table->firstvisible;
while ((ptmp != NULL) && (ptmp->prev_entry != table->lastvisible)) {
- printentry(table, ptmp, mode);
+ printentry(table, ptmp);
ptmp = ptmp->next_entry;
}
diff --git a/src/tcptable.h b/src/tcptable.h
index 20dadd1..f50882b 100644
--- a/src/tcptable.h
+++ b/src/tcptable.h
@@ -96,6 +96,7 @@ struct tcptable {
unsigned int bmaxy; /* number of lines of the border window */
unsigned int imaxy; /* number of lines inside the border */
int ifnamew; /* interface name width to display */
+ int mode;
WINDOW *tcpscreen;
PANEL *tcppanel;
WINDOW *borderwin;
@@ -125,10 +126,9 @@ void addtoclosedlist(struct tcptable *table, struct tcptableent
*tableentry);
void clearaddr(struct tcptable *table, struct tcptableent *tableentry);
-void printentry(struct tcptable *table, struct tcptableent *tableentry,
- int mode);
+void printentry(struct tcptable *table, struct tcptableent *tableentry);
-void refreshtcpwin(struct tcptable *table, int mode);
+void refreshtcpwin(struct tcptable *table);
void destroytcptable(struct tcptable *table);
--
1.8.4
8:05 a.m.
New subject: [PATCH 04/20] ipmon(): no need to redraw sort win
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 3f8ef9c..0bb1d35 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -898,19 +898,11 @@ void ipmon(time_t facilitytime, char *ifptr)
keymode = 0;
del_panel(sortpanel);
delwin(sortwin);
- show_sort_statwin(&sortwin, &sortpanel);
- update_panels();
- doupdate();
sortipents(&table, ch, logging, logfile);
-
if (table.barptr != NULL) {
table.barptr = table.firstvisible;
}
refreshtcpwin(&table);
- del_panel(sortpanel);
- delwin(sortwin);
- update_panels();
- doupdate();
}
no_key_ready:
--
1.8.4
8:05 a.m.
New subject: [PATCH 05/20] itrafmon.c: refactor TCP screen scrolling
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 125 ++++++++++++++++++++++++++++++++-------------------------
1 file changed, 70 insertions(+), 55 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 0bb1d35..73e6aee 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -118,46 +118,97 @@ static void scrollupperwin(struct tcptable *table, int direction)
wattrset(table->tcpscreen, STDATTR);
if (direction == SCROLLUP) {
if (table->lastvisible != table->tail) {
- wscrl(table->tcpscreen, 1);
- table->lastvisible = table->lastvisible->next_entry;
table->firstvisible = table->firstvisible->next_entry;
- wmove(table->tcpscreen, table->imaxy - 1, 0);
+ table->lastvisible = table->lastvisible->next_entry;
+
+ wscrl(table->tcpscreen, 1);
scrollok(table->tcpscreen, 0);
+ wmove(table->tcpscreen, table->imaxy - 1, 0);
wprintw(table->tcpscreen, "%*c", COLS - 2, ' ');
scrollok(table->tcpscreen, 1);
+
printentry(table, table->lastvisible);
}
} else {
if (table->firstvisible != table->head) {
- wscrl(table->tcpscreen, -1);
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
+
+ wscrl(table->tcpscreen, -1);
mvwprintw(table->tcpscreen, 0, 0, "%*c", COLS - 2, ' ');
+
printentry(table, table->firstvisible);
}
}
}
-static void pageupperwin(struct tcptable *table, int direction)
+static void move_tcp_bar_one(struct tcptable *table, int direction)
{
- unsigned int i = 1;
+ switch (direction) {
+ case SCROLLUP:
+ if (table->barptr->next_entry == NULL)
+ break;
- wattrset(table->tcpscreen, STDATTR);
- if (direction == SCROLLUP) {
- while ((i <= table->imaxy - 3)
- && (table->lastvisible != table->tail)) {
- i++;
+ if (table->barptr == table->lastvisible)
+ scrollupperwin(table, SCROLLUP);
+
+ table->barptr = table->barptr->next_entry;
+ printentry(table, table->barptr->prev_entry); /* hide bar */
+ printentry(table, table->barptr); /* show bar */
+
+ break;
+ case SCROLLDOWN:
+ if (table->barptr->prev_entry == NULL)
+ break;
+
+ if (table->barptr == table->firstvisible)
+ scrollupperwin(table, SCROLLDOWN);
+
+ table->barptr = table->barptr->prev_entry;
+ printentry(table, table->barptr->next_entry); /* hide bar */
+ printentry(table, table->barptr); /* show bar */
+
+ break;
+ }
+}
+
+static void move_tcp_bar_many(struct tcptable *table, int direction, int lines)
+{
+ switch (direction) {
+ case SCROLLUP:
+ while (lines && (table->lastvisible != table->tail)) {
table->firstvisible = table->firstvisible->next_entry;
table->lastvisible = table->lastvisible->next_entry;
+ lines--;
}
- } else {
- while ((i <= table->imaxy - 3)
- && (table->firstvisible != table->head)) {
- i++;
+ if (lines == 0)
+ table->barptr = table->firstvisible;
+ else
+ table->barptr = table->lastvisible;
+ break;
+ case SCROLLDOWN:
+ while (lines && (table->firstvisible != table->head)) {
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
+ lines--;
}
+ table->barptr = table->firstvisible;
+ break;
}
+ refreshtcpwin(table);
+}
+
+static void move_tcp_bar(struct tcptable *table, int direction, int lines)
+{
+ if (table->barptr == NULL)
+ return;
+ if (lines < 1)
+ return;
+ if (lines < 10)
+ while (lines--)
+ move_tcp_bar_one(table, direction);
+ else
+ move_tcp_bar_many(table, direction, lines);
}
/*
@@ -554,7 +605,6 @@ void ipmon(time_t facilitytime, char *ifptr)
struct tcptable table;
struct tcptableent *tcpentry;
- struct tcptableent *tmptcp;
struct othptable othptbl;
@@ -769,37 +819,14 @@ void ipmon(time_t facilitytime, char *ifptr)
scrolllowerwin(&othptbl, SCROLLDOWN);
break;
}
- if (!table.barptr
- || !table.barptr->prev_entry)
- break;
-
- tmptcp = table.barptr;
- table.barptr = table.barptr->prev_entry;
-
- printentry(&table, tmptcp);
-
- if (tmptcp == table.firstvisible)
- scrollupperwin(&table, SCROLLDOWN);
-
- printentry(&table, table.barptr);
+ move_tcp_bar(&table, SCROLLDOWN, 1);
break;
case KEY_DOWN:
if (curwin) {
scrolllowerwin(&othptbl, SCROLLUP);
break;
}
- if (!table.barptr
- || !table.barptr->next_entry)
- break;
-
- tmptcp = table.barptr;
- table.barptr = table.barptr->next_entry;
- printentry(&table, tmptcp);
-
- if (tmptcp == table.lastvisible)
- scrollupperwin(&table, SCROLLUP);
-
- printentry(&table,table.barptr);
+ move_tcp_bar(&table, SCROLLUP, 1);
break;
case KEY_RIGHT:
if (!curwin)
@@ -826,13 +853,7 @@ void ipmon(time_t facilitytime, char *ifptr)
refresh_othwindow(&othptbl);
break;
}
-
- if (!table.barptr)
- break;
-
- pageupperwin(&table, SCROLLDOWN);
- table.barptr = table.lastvisible;
- refreshtcpwin(&table);
+ move_tcp_bar(&table, SCROLLDOWN, table.imaxy);
break;
case KEY_NPAGE:
case ' ':
@@ -841,13 +862,7 @@ void ipmon(time_t facilitytime, char *ifptr)
refresh_othwindow(&othptbl);
break;
}
-
- if (!table.barptr)
- break;
-
- pageupperwin(&table, SCROLLUP);
- table.barptr = table.firstvisible;
- refreshtcpwin(&table);
+ move_tcp_bar(&table, SCROLLUP, table.imaxy);
break;
case KEY_F(6):
case 'w':
--
1.8.4
8:05 a.m.
New subject: [PATCH 06/20] othptab.c: use struct in_addr for IPv4 address
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/othptab.c | 22 +++++++---------------
src/othptab.h | 4 ++--
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/othptab.c b/src/othptab.c
index 4f5a002..40acebf 100644
--- a/src/othptab.c
+++ b/src/othptab.c
@@ -29,12 +29,6 @@ othptab.c - non-TCP protocol display module
#define MSGSTRING_MAX 240
#define SHORTSTRING_MAX 40
-/*
-* A trick to suppress uninitialized variable warning without generating any
-* code
-*/
-#define uninitialized_var(x) x = x
-
static void writeothplog(int logging, FILE *fd, char *protname,
char *description, char *additional, int is_ip,
int withmac, struct othptabent *entry)
@@ -260,9 +254,9 @@ struct othptabent *add_othp_entry(struct othptable *table, struct
pkt_hdr *pkt,
if (protocol == ETH_P_ARP) {
new_entry->un.arp.opcode =
((struct arp_hdr *) packet2)->ar_op;
- memcpy(&(new_entry->un.arp.src_ip_address),
+ memcpy(&new_entry->un.arp.src_ip_address.s_addr,
&(((struct arp_hdr *) packet2)->ar_sip), 4);
- memcpy(&(new_entry->un.arp.dest_ip_address),
+ memcpy(&new_entry->un.arp.dest_ip_address.s_addr,
&(((struct arp_hdr *) packet2)->ar_tip), 4);
} else if (protocol == ETH_P_RARP) {
new_entry->un.rarp.opcode =
@@ -369,8 +363,6 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
char *packet_type;
- struct in_addr uninitialized_var(saddr);
-
char rarp_mac_addr[18];
unsigned int unknown = 0;
@@ -388,6 +380,8 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
table->htstat = HIND;
}
if (!(entry->is_ip)) {
+ struct in_addr *saddr = NULL;
+
wmove(table->othpwin, target_row, 0);
scrollok(table->othpwin, 0);
wattrset(table->othpwin, UNKNATTR);
@@ -401,17 +395,15 @@ void printothpentry(struct othptable *table, struct othptabent
*entry,
switch (ntohs(entry->un.arp.opcode)) {
case ARPOP_REQUEST:
strcat(msgstring, "request for ");
- memcpy(&(saddr.s_addr),
- entry->un.arp.dest_ip_address, 4);
+ saddr = &entry->un.arp.dest_ip_address;
break;
case ARPOP_REPLY:
strcat(msgstring, "reply from ");
- memcpy(&(saddr.s_addr),
- entry->un.arp.src_ip_address, 4);
+ saddr = &entry->un.arp.src_ip_address;
break;
}
- inet_ntop(AF_INET, &saddr, scratchpad, sizeof(scratchpad));
+ inet_ntop(AF_INET, saddr, scratchpad, sizeof(scratchpad));
strcat(msgstring, scratchpad);
wattrset(table->othpwin, ARPATTR);
break;
diff --git a/src/othptab.h b/src/othptab.h
index fd623d8..d4d9234 100644
--- a/src/othptab.h
+++ b/src/othptab.h
@@ -49,8 +49,8 @@ struct othptabent {
} ospf;
struct {
unsigned short opcode;
- char src_ip_address[4];
- char dest_ip_address[4];
+ struct in_addr src_ip_address;
+ struct in_addr dest_ip_address;
} arp;
struct {
unsigned short opcode;
--
1.8.4
8:05 a.m.
New subject: [PATCH 07/20] ipmon(): move dropped packets count
... to not overlap with "Active" flag of the lower window.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 73e6aee..8ee860b 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -781,7 +781,7 @@ void ipmon(time_t facilitytime, char *ifptr)
tv_rate = tv;
dropped += packet_get_dropped(fd);
- print_packet_drops(dropped, othptbl.borderwin, othptbl.obmaxy - 1, 49);
+ print_packet_drops(dropped, othptbl.borderwin, othptbl.obmaxy - 1, 40);
}
/*
--
1.8.4
8:05 a.m.
New subject: [PATCH 08/20] itrafmon.c: refactor other packet screen scrolling
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 116 ++++++++++++++++++++++++++++++---------------------------
1 file changed, 62 insertions(+), 54 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 8ee860b..1168408 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -215,69 +215,83 @@ static void move_tcp_bar(struct tcptable *table, int direction, int
lines)
* Scrolling and paging routines for the lower (non-TCP) window.
*/
-static void scrolllowerwin(struct othptable *table, int direction)
+static void scroll_othp_one(struct othptable *table, int direction)
{
- if (direction == SCROLLUP) {
+ switch (direction) {
+ case SCROLLUP:
if (table->lastvisible != table->tail) {
- wscrl(table->othpwin, 1);
- table->lastvisible = table->lastvisible->next_entry;
table->firstvisible = table->firstvisible->next_entry;
+ table->lastvisible = table->lastvisible->next_entry;
+
+ wscrl(table->othpwin, 1);
+ printothpentry(table, table->lastvisible,
+ table->oimaxy - 1, 0, NULL);
if (table->htstat == HIND) { /* Head indicator on? */
wmove(table->borderwin, table->obmaxy - 1, 1);
whline(table->borderwin, ACS_HLINE, 8);
table->htstat = NOHTIND;
}
- printothpentry(table, table->lastvisible,
- table->oimaxy - 1, 0, NULL);
}
- } else {
+ break;
+ case SCROLLDOWN:
if (table->firstvisible != table->head) {
- wscrl(table->othpwin, -1);
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
+ wscrl(table->othpwin, -1);
+ printothpentry(table, table->firstvisible, 0, 0, NULL);
+
if (table->htstat == TIND) { /* Tail indicator on? */
wmove(table->borderwin, table->obmaxy - 1, 1);
whline(table->borderwin, ACS_HLINE, 8);
table->htstat = NOHTIND;
}
- printothpentry(table, table->firstvisible, 0, 0, NULL);
}
+ break;
}
}
-static void pagelowerwin(struct othptable *table, int direction)
+static void scroll_othp_many(struct othptable *table, int direction, int lines)
{
- unsigned int i = 1;
-
- if (direction == SCROLLUP) {
- while ((i <= table->oimaxy - 2)
- && (table->lastvisible != table->tail)) {
- i++;
+ switch (direction) {
+ case SCROLLUP:
+ while (lines-- && (table->lastvisible != table->tail)) {
table->firstvisible = table->firstvisible->next_entry;
table->lastvisible = table->lastvisible->next_entry;
-
- if (table->htstat == HIND) { /* Head indicator on? */
- wmove(table->borderwin, table->obmaxy - 1, 1);
- whline(table->borderwin, ACS_HLINE, 8);
- table->htstat = NOHTIND;
- }
}
- } else {
- while ((i <= table->oimaxy - 2)
- && (table->firstvisible != table->head)) {
- i++;
+ if (table->htstat == HIND) { /* Head indicator on? */
+ wmove(table->borderwin, table->obmaxy - 1, 1);
+ whline(table->borderwin, ACS_HLINE, 8);
+ table->htstat = NOHTIND;
+ }
+ break;
+ case SCROLLDOWN:
+ while (lines-- && (table->firstvisible != table->head)) {
table->firstvisible = table->firstvisible->prev_entry;
table->lastvisible = table->lastvisible->prev_entry;
-
- if (table->htstat == TIND) { /* Tail indicator on? */
- wmove(table->borderwin, table->obmaxy - 1, 1);
- whline(table->borderwin, ACS_HLINE, 8);
- table->htstat = NOHTIND;
- }
}
+ if (table->htstat == TIND) { /* Tail indicator on? */
+ wmove(table->borderwin, table->obmaxy - 1, 1);
+ whline(table->borderwin, ACS_HLINE, 8);
+ table->htstat = NOHTIND;
+ }
+ break;
}
+ refresh_othwindow(table);
+}
+
+static void scroll_othp(struct othptable *table, int direction, int lines)
+{
+ if (table->head == NULL)
+ return;
+ if (lines < 1)
+ return;
+ if (lines < getmaxy(table->othpwin))
+ while (lines--)
+ scroll_othp_one(table, direction);
+ else
+ scroll_othp_many(table, direction, lines);
}
/*
@@ -815,18 +829,16 @@ void ipmon(time_t facilitytime, char *ifptr)
if (keymode == 0) {
switch (ch) {
case KEY_UP:
- if (curwin) {
- scrolllowerwin(&othptbl, SCROLLDOWN);
- break;
- }
- move_tcp_bar(&table, SCROLLDOWN, 1);
+ if (curwin)
+ scroll_othp(&othptbl, SCROLLDOWN, 1);
+ else
+ move_tcp_bar(&table, SCROLLDOWN, 1);
break;
case KEY_DOWN:
- if (curwin) {
- scrolllowerwin(&othptbl, SCROLLUP);
- break;
- }
- move_tcp_bar(&table, SCROLLUP, 1);
+ if (curwin)
+ scroll_othp(&othptbl, SCROLLUP, 1);
+ else
+ move_tcp_bar(&table, SCROLLUP, 1);
break;
case KEY_RIGHT:
if (!curwin)
@@ -848,21 +860,17 @@ void ipmon(time_t facilitytime, char *ifptr)
break;
case KEY_PPAGE:
case '-':
- if (curwin) {
- pagelowerwin(&othptbl, SCROLLDOWN);
- refresh_othwindow(&othptbl);
- break;
- }
- move_tcp_bar(&table, SCROLLDOWN, table.imaxy);
+ if (curwin)
+ scroll_othp(&othptbl, SCROLLDOWN, othptbl.oimaxy);
+ else
+ move_tcp_bar(&table, SCROLLDOWN, table.imaxy);
break;
case KEY_NPAGE:
case ' ':
- if (curwin) {
- pagelowerwin(&othptbl, SCROLLUP);
- refresh_othwindow(&othptbl);
- break;
- }
- move_tcp_bar(&table, SCROLLUP, table.imaxy);
+ if (curwin)
+ scroll_othp(&othptbl, SCROLLUP, othptbl.oimaxy);
+ else
+ move_tcp_bar(&table, SCROLLUP, table.imaxy);
break;
case KEY_F(6):
case 'w':
--
1.8.4
8:05 a.m.
New subject: [PATCH 09/20] ipmon(): allow scrolling with Home, End keys
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 1168408..f1eda1f 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -872,6 +872,18 @@ void ipmon(time_t facilitytime, char *ifptr)
else
move_tcp_bar(&table, SCROLLUP, table.imaxy);
break;
+ case KEY_HOME:
+ if (curwin)
+ scroll_othp(&othptbl, SCROLLDOWN, INT_MAX);
+ else
+ move_tcp_bar(&table, SCROLLDOWN, INT_MAX);
+ break;
+ case KEY_END:
+ if (curwin)
+ scroll_othp(&othptbl, SCROLLUP, INT_MAX);
+ else
+ move_tcp_bar(&table, SCROLLUP, INT_MAX);
+ break;
case KEY_F(6):
case 'w':
case 'W':
--
1.8.4
8:05 a.m.
New subject: [PATCH 10/20] tcptable.c: simplify destroy_closed_entries()
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tcptable.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/tcptable.c b/src/tcptable.c
index 5e5ee11..f613e31 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -899,23 +899,16 @@ void refreshtcpwin(struct tcptable *table)
static void destroy_closed_entries(struct tcptable *table)
{
- struct closedlist *closedtemp;
- struct closedlist *closedtemp_next;
-
- if (table->closedentries != NULL) {
- closedtemp = table->closedentries;
- closedtemp_next = table->closedentries->next_entry;
-
- while (closedtemp != NULL) {
- free(closedtemp);
- closedtemp = closedtemp_next;
- if (closedtemp_next != NULL)
- closedtemp_next = closedtemp_next->next_entry;
- }
+ struct closedlist *ptmp = table->closedentries;
+
+ while (ptmp != NULL) {
+ struct closedlist *ctmp = ptmp->next_entry;
- table->closedentries = NULL;
- table->closedtail = NULL;
+ free(ptmp);
+ ptmp = ctmp;
}
+ table->closedentries = NULL;
+ table->closedtail = NULL;
}
/*
--
1.8.4
8:05 a.m.
New subject: [PATCH 11/20] tcptable.c: simplify destroytcptable()
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tcptable.c | 74 ++++++++++++++++++++++++----------------------------------
1 file changed, 30 insertions(+), 44 deletions(-)
diff --git a/src/tcptable.c b/src/tcptable.c
index f613e31..9f29c5b 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -911,60 +911,46 @@ static void destroy_closed_entries(struct tcptable *table)
table->closedtail = NULL;
}
-/*
- * Kill the entire TCP table
- */
-void destroytcptable(struct tcptable *table)
+static void destroy_tcp_entries(struct tcptable *table)
{
- struct tcptableent *ctemp;
- struct tcptableent *c_next_entry;
- struct tcp_hashentry *hashtemp;
- struct tcp_hashentry *hashtemp_next;
-
- unsigned int i;
+ struct tcptableent *ptmp = table->head;
- /*
- * Destroy main TCP table
- */
+ while (ptmp != NULL) {
+ struct tcptableent *ctmp = ptmp->next_entry;
- if (table->head != NULL) {
- ctemp = table->head;
- c_next_entry = table->head->next_entry;
+ rate_destroy(&ptmp->rate);
+ free(ptmp);
+ ptmp = ctmp;
+ }
+ table->head = NULL;
+ table->tail = NULL;
+}
- while (ctemp != NULL) {
- rate_destroy(&ctemp->rate);
- free(ctemp);
- ctemp = c_next_entry;
+static void destroy_hash_entries(struct tcptable *table)
+{
+ for (unsigned int i = 0; i < ENTRIES_IN_HASH_TABLE; i++) {
+ struct tcp_hashentry *ptmp = table->hash_table[i];
+ while (ptmp != NULL) {
+ struct tcp_hashentry *ctmp = ptmp->next_entry;
- if (c_next_entry != NULL)
- c_next_entry = c_next_entry->next_entry;
+ free(ptmp);
+ ptmp = ctmp;
}
+ table->hash_table[i] = NULL;
}
- /*
- * Destroy list of closed entries
- */
-
- destroy_closed_entries(table);
-
- /*
- * Destroy hash table
- */
+}
- for (i = 0; i <= ENTRIES_IN_HASH_TABLE - 1; i++) {
- if (table->hash_table[i] != NULL) {
- hashtemp = table->hash_table[i];
- hashtemp_next = table->hash_table[i]->next_entry;
+/* kill the entire TCP table */
+void destroytcptable(struct tcptable *table)
+{
+ /* destroy main TCP table */
+ destroy_tcp_entries(table);
- while (hashtemp != NULL) {
- free(hashtemp);
- hashtemp = hashtemp_next;
+ /* destroy list of closed entries */
+ destroy_closed_entries(table);
- if (hashtemp_next != NULL)
- hashtemp_next =
- hashtemp_next->next_entry;
- }
- }
- }
+ /* destroy hash table */
+ destroy_hash_entries(table);
}
/*
--
1.8.4
8:05 a.m.
New subject: [PATCH 12/20] struct tcptablent: kill unused starttime variable
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tcptable.c | 7 ++-----
src/tcptable.h | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/tcptable.c b/src/tcptable.c
index 9f29c5b..29ef748 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -388,13 +388,10 @@ struct tcptableent *addentry(struct tcptable *table,
* Mark flow rate start time and byte counter for flow computation
* if the highlight bar is on either flow of the new connection.
*/
- if (table->barptr == new_entry) {
- new_entry->starttime = time(NULL);
+ if (table->barptr == new_entry)
new_entry->spanbr = 0;
- } else if (table->barptr == new_entry->oth_connection) {
- new_entry->oth_connection->starttime = time(NULL);
+ else if (table->barptr == new_entry->oth_connection)
new_entry->oth_connection->spanbr = 0;
- }
/*
* Add entries to hash table
diff --git a/src/tcptable.h b/src/tcptable.h
index f50882b..9fe0063 100644
--- a/src/tcptable.h
+++ b/src/tcptable.h
@@ -59,7 +59,6 @@ struct tcptableent {
unsigned long spanbr;
struct rate rate;
time_t lastupdate;
- time_t starttime;
time_t conn_starttime;
struct tcp_hashentry *hash_node;
struct tcptableent *oth_connection; /* the other half of the connection */
--
1.8.4
8:05 a.m.
New subject: [PATCH 13/20] updateentry(): rename transpacket variable to tcp
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/tcptable.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/tcptable.c b/src/tcptable.c
index 29ef748..35a0bb0 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -534,7 +534,7 @@ struct tcptableent *in_table(struct tcptable *table,
*/
void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
- struct tcptableent *tableentry, struct tcphdr *transpacket,
+ struct tcptableent *tableentry, struct tcphdr *tcp,
unsigned int bcount, int *revlook, int rvnfd, int logging,
FILE *logfile)
{
@@ -600,19 +600,19 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
*/
if (tableentry->pcount == 1) {
- if ((transpacket->syn) || (transpacket->rst))
+ if (tcp->syn || tcp->rst)
tableentry->partial = 0;
else
tableentry->partial = 1;
}
- tableentry->win = ntohs(transpacket->window);
+ tableentry->win = ntohs(tcp->window);
tableentry->stat = 0;
- if (transpacket->syn)
+ if (tcp->syn)
tableentry->stat |= FLAG_SYN;
- if (transpacket->ack) {
+ if (tcp->ack) {
tableentry->stat |= FLAG_ACK;
/*
@@ -626,7 +626,7 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
*/
if ((tableentry->oth_connection->finsent == 1)
- && (ntohl(transpacket->seq) ==
+ && (ntohl(tcp->seq) ==
tableentry->oth_connection->finack)) {
tableentry->oth_connection->finsent = 2;
@@ -647,7 +647,7 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
* in ACK above.
*/
- if (transpacket->fin) {
+ if (tcp->fin) {
/*
* First, we check if the opposite direction has no counts, in which
@@ -675,7 +675,7 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
*/
tableentry->finsent = 1;
- tableentry->finack = ntohl(transpacket->ack_seq);
+ tableentry->finack = ntohl(tcp->ack_seq);
}
if (logging) {
char flowrate[64];
@@ -688,7 +688,7 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
tableentry->psize, msgstring);
}
}
- if (transpacket->rst) {
+ if (tcp->rst) {
tableentry->stat |= FLAG_RST;
if (!(tableentry->inclosed))
addtoclosedlist(table, tableentry);
@@ -707,10 +707,10 @@ void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
tableentry->psize, msgstring);
}
}
- if (transpacket->psh)
+ if (tcp->psh)
tableentry->stat |= FLAG_PSH;
- if (transpacket->urg)
+ if (tcp->urg)
tableentry->stat |= FLAG_URG;
tableentry->lastupdate = tableentry->oth_connection->lastupdate =
--
1.8.4
8:05 a.m.
New subject: [PATCH 14/20] ipmon(): move statwin nad statpanel variables into struct tcptable
... and make necessary changes to make it compile.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 38 ++++++--------------------------------
src/tcptable.c | 21 +++++++++++++++++++++
src/tcptable.h | 5 +++++
3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index f1eda1f..e75eac2 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -67,15 +67,6 @@ static void uniq_help(int what)
STATUSBARATTR);
}
-/* Mark general packet count indicators */
-
-static void prepare_statwin(WINDOW * win)
-{
- wattrset(win, IPSTATLABELATTR);
- mvwprintw(win, 0, 1, "Packets captured:");
- mvwaddch(win, 0, 45 * COLS / 80, ACS_VLINE);
-}
-
static void markactive(int curwin, WINDOW * tw, WINDOW * ow)
{
WINDOW *win1;
@@ -101,14 +92,6 @@ static void markactive(int curwin, WINDOW * tw, WINDOW * ow)
whline(win2, ACS_HLINE, 8);
}
-static void show_stats(WINDOW * win, unsigned long long total)
-{
- wattrset(win, IPSTATATTR);
- wmove(win, 0, 35 * COLS / 80);
- printlargenum(total, win);
-}
-
-
/*
* Scrolling and paging routines for the upper (TCP) window
*/
@@ -601,9 +584,6 @@ void ipmon(time_t facilitytime, char *ifptr)
struct timeval updtime;
time_t closedint = 0;
- WINDOW *statwin;
- PANEL *statpanel;
-
WINDOW *sortwin;
PANEL *sortpanel;
@@ -662,12 +642,6 @@ void ipmon(time_t facilitytime, char *ifptr)
init_tcp_table(&table);
init_othp_table(&othptbl);
- statwin = newwin(1, COLS, LINES - 2, 0);
- statpanel = new_panel(statwin);
- wattrset(statwin, IPSTATLABELATTR);
- mvwprintw(statwin, 0, 0, "%*c", COLS, ' ');
- prepare_statwin(statwin);
- show_stats(statwin, 0);
markactive(curwin, table.borderwin, othptbl.borderwin);
update_panels();
doupdate();
@@ -771,7 +745,7 @@ void ipmon(time_t facilitytime, char *ifptr)
*/
if (screen_update_needed(&tv, &updtime)) {
- show_stats(statwin, total_pkts);
+ show_stats(table.statwin, total_pkts);
update_panels();
doupdate();
@@ -786,10 +760,10 @@ void ipmon(time_t facilitytime, char *ifptr)
if (rate_msecs > 1000) {
update_flowrate(&table, rate_msecs);
if (table.barptr != NULL) {
- print_flowrate(table.barptr, statwin);
+ print_flowrate(table.barptr, table.statwin);
} else {
- wattrset(statwin, IPSTATATTR);
- mvwprintw(statwin, 0, statx,
+ wattrset(table.statwin, IPSTATATTR);
+ mvwprintw(table.statwin, 0, statx,
"No TCP entries ");
}
tv_rate = tv;
@@ -1132,14 +1106,14 @@ err:
del_panel(table.borderpanel);
del_panel(othptbl.othppanel);
del_panel(othptbl.borderpanel);
- del_panel(statpanel);
+ del_panel(table.statpanel);
update_panels();
doupdate();
delwin(table.tcpscreen);
delwin(table.borderwin);
delwin(othptbl.othpwin);
delwin(othptbl.borderwin);
- delwin(statwin);
+ delwin(table.statwin);
destroytcptable(&table);
destroyothptable(&othptbl);
packet_destroy(&pkt);
diff --git a/src/tcptable.c b/src/tcptable.c
index 35a0bb0..06d1572 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -96,6 +96,20 @@ static void print_tcp_num_entries(struct tcptable *table)
table->count);
}
+static void prepare_statwin(WINDOW *win)
+{
+ wattrset(win, IPSTATLABELATTR);
+ mvwprintw(win, 0, 1, "Packets captured:");
+ mvwaddch(win, 0, 45 * COLS / 80, ACS_VLINE);
+}
+
+void show_stats(WINDOW *win, unsigned long long total)
+{
+ wattrset(win, IPSTATATTR);
+ wmove(win, 0, 35 * COLS / 80);
+ printlargenum(total, win);
+}
+
void init_tcp_table(struct tcptable *table)
{
int i;
@@ -137,6 +151,13 @@ void init_tcp_table(struct tcptable *table)
tx_stdwinset(table->tcpscreen);
print_tcp_num_entries(table);
+ table->statwin = newwin(1, COLS, LINES - 2, 0);
+ table->statpanel = new_panel(table->statwin);
+ wattrset(table->statwin, IPSTATLABELATTR);
+ mvwprintw(table->statwin, 0, 0, "%*c", COLS, ' ');
+ prepare_statwin(table->statwin);
+ show_stats(table->statwin, 0);
+
/*
* Initialize hash table to nulls
*/
diff --git a/src/tcptable.h b/src/tcptable.h
index 9fe0063..ff692fe 100644
--- a/src/tcptable.h
+++ b/src/tcptable.h
@@ -96,12 +96,17 @@ struct tcptable {
unsigned int imaxy; /* number of lines inside the border */
int ifnamew; /* interface name width to display */
int mode;
+
WINDOW *tcpscreen;
PANEL *tcppanel;
WINDOW *borderwin;
PANEL *borderpanel;
+ WINDOW *statwin;
+ PANEL *statpanel;
};
+void show_stats(WINDOW *win, unsigned long long total);
+
void init_tcp_table(struct tcptable *table);
struct tcptableent *addentry(struct tcptable *table,
--
1.8.4
8:05 a.m.
New subject: [PATCH 15/20] ipmon(): move NULL check into print_flowrate()
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index e75eac2..53ed875 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -555,15 +555,22 @@ static void update_flowrate(struct tcptable *table, unsigned long
msecs)
}
}
-static void print_flowrate(struct tcptableent *entry, WINDOW *win)
+static void print_flowrate(struct tcptable *table)
{
- wattrset(win, IPSTATLABELATTR);
- mvwprintw(win, 0, COLS * 47 / 80, "TCP flow rate: ");
- wattrset(win, IPSTATATTR);
-
- char buf[32];
- rate_print(rate_get_average(&entry->rate), buf, sizeof(buf));
- mvwprintw(win, 0, COLS * 52 / 80 + 13, "%s", buf);
+ if (table->barptr == NULL) {
+ wattrset(table->statwin, IPSTATATTR);
+ mvwprintw(table->statwin, 0, COLS * 47 / 80,
+ "No TCP entries ");
+ } else {
+ wattrset(table->statwin, IPSTATLABELATTR);
+ mvwprintw(table->statwin, 0, COLS * 47 / 80,
+ "TCP flow rate: ");
+
+ char buf[32];
+ rate_print(rate_get_average(&table->barptr->rate), buf, sizeof(buf));
+ wattrset(table->statwin, IPSTATATTR);
+ mvwprintw(table->statwin, 0, COLS * 52 / 80 + 13, "%s", buf);
+ }
}
/*
@@ -622,8 +629,6 @@ void ipmon(time_t facilitytime, char *ifptr)
int revlook = options.revlook;
int wasempty = 1;
- const int statx = COLS * 47 / 80;
-
/*
* Mark this instance of the traffic monitor
*/
@@ -754,18 +759,12 @@ void ipmon(time_t facilitytime, char *ifptr)
/*
* If highlight bar is on some entry, update the flow rate
- * indicator after five seconds.
+ * indicator every second.
*/
unsigned long rate_msecs = timeval_diff_msec(&tv, &tv_rate);
if (rate_msecs > 1000) {
update_flowrate(&table, rate_msecs);
- if (table.barptr != NULL) {
- print_flowrate(table.barptr, table.statwin);
- } else {
- wattrset(table.statwin, IPSTATATTR);
- mvwprintw(table.statwin, 0, statx,
- "No TCP entries ");
- }
+ print_flowrate(&table);
tv_rate = tv;
dropped += packet_get_dropped(fd);
--
1.8.4
8:05 a.m.
New subject: [PATCH 16/20] move_tcp_bar(): print flow rate after moving the bar
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 56 +++++++++++++++++++++++++++++---------------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 53ed875..f65b655 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -92,6 +92,33 @@ static void markactive(int curwin, WINDOW * tw, WINDOW * ow)
whline(win2, ACS_HLINE, 8);
}
+static void update_flowrate(struct tcptable *table, unsigned long msecs)
+{
+ struct tcptableent *entry;
+ for (entry = table->head; entry != NULL; entry = entry->next_entry) {
+ rate_add_rate(&entry->rate, entry->spanbr, msecs);
+ entry->spanbr = 0;
+ }
+}
+
+static void print_flowrate(struct tcptable *table)
+{
+ if (table->barptr == NULL) {
+ wattrset(table->statwin, IPSTATATTR);
+ mvwprintw(table->statwin, 0, COLS * 47 / 80,
+ "No TCP entries ");
+ } else {
+ wattrset(table->statwin, IPSTATLABELATTR);
+ mvwprintw(table->statwin, 0, COLS * 47 / 80,
+ "TCP flow rate: ");
+
+ char buf[32];
+ rate_print(rate_get_average(&table->barptr->rate), buf, sizeof(buf));
+ wattrset(table->statwin, IPSTATATTR);
+ mvwprintw(table->statwin, 0, COLS * 52 / 80 + 13, "%s", buf);
+ }
+}
+
/*
* Scrolling and paging routines for the upper (TCP) window
*/
@@ -192,6 +219,8 @@ static void move_tcp_bar(struct tcptable *table, int direction, int
lines)
move_tcp_bar_one(table, direction);
else
move_tcp_bar_many(table, direction, lines);
+
+ print_flowrate(table);
}
/*
@@ -546,33 +575,6 @@ static int checkrvnamed(void)
return 1;
}
-static void update_flowrate(struct tcptable *table, unsigned long msecs)
-{
- struct tcptableent *entry;
- for (entry = table->head; entry != NULL; entry = entry->next_entry) {
- rate_add_rate(&entry->rate, entry->spanbr, msecs);
- entry->spanbr = 0;
- }
-}
-
-static void print_flowrate(struct tcptable *table)
-{
- if (table->barptr == NULL) {
- wattrset(table->statwin, IPSTATATTR);
- mvwprintw(table->statwin, 0, COLS * 47 / 80,
- "No TCP entries ");
- } else {
- wattrset(table->statwin, IPSTATLABELATTR);
- mvwprintw(table->statwin, 0, COLS * 47 / 80,
- "TCP flow rate: ");
-
- char buf[32];
- rate_print(rate_get_average(&table->barptr->rate), buf, sizeof(buf));
- wattrset(table->statwin, IPSTATATTR);
- mvwprintw(table->statwin, 0, COLS * 52 / 80 + 13, "%s", buf);
- }
-}
-
/*
* The IP Traffic Monitor
*/
--
1.8.4
8:05 a.m.
New subject: [PATCH 17/20] itrafmon.c: rename update_flowrate() to update_flowrates()
... to match reality.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index f65b655..69f1622 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -92,7 +92,7 @@ static void markactive(int curwin, WINDOW * tw, WINDOW * ow)
whline(win2, ACS_HLINE, 8);
}
-static void update_flowrate(struct tcptable *table, unsigned long msecs)
+static void update_flowrates(struct tcptable *table, unsigned long msecs)
{
struct tcptableent *entry;
for (entry = table->head; entry != NULL; entry = entry->next_entry) {
@@ -765,7 +765,7 @@ void ipmon(time_t facilitytime, char *ifptr)
*/
unsigned long rate_msecs = timeval_diff_msec(&tv, &tv_rate);
if (rate_msecs > 1000) {
- update_flowrate(&table, rate_msecs);
+ update_flowrates(&table, rate_msecs);
print_flowrate(&table);
tv_rate = tv;
--
1.8.4
8:05 a.m.
New subject: [PATCH 18/20] ipmon(): optimize: move some checks away from the hot path
Most checks can be done with 1sec granularity. Check if time
in seconds changes and process all the needed work only there.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 81 ++++++++++++++++++++++++----------------------------------
1 file changed, 33 insertions(+), 48 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 69f1622..c6edc25 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -586,7 +586,7 @@ void ipmon(time_t facilitytime, char *ifptr)
in_port_t sport = 0, dport = 0; /* TCP/UDP port values */
struct timeval tv;
- struct timeval tv_rate;
+ struct timeval last_time;
time_t starttime = 0;
time_t now = 0;
time_t timeint = 0;
@@ -714,7 +714,7 @@ void ipmon(time_t facilitytime, char *ifptr)
exitloop = 0;
gettimeofday(&tv, NULL);
- tv_rate = tv;
+ last_time = tv;
updtime = tv;
starttime = timeint = closedint = tv.tv_sec;
@@ -726,27 +726,6 @@ void ipmon(time_t facilitytime, char *ifptr)
gettimeofday(&tv, NULL);
now = tv.tv_sec;
- /*
- * Print timer at bottom of screen
- */
-
- if (now - timeint >= 5) {
- printelapsedtime(starttime, now, othptbl.obmaxy - 1, 15,
- othptbl.borderwin);
- timeint = now;
- }
-
- /*
- * Automatically clear closed/timed out entries
- */
-
- if ((options.closedint != 0)
- && ((now - closedint) / 60 >= options.closedint)) {
- flushclosedentries(&table, logging, logfile);
- refreshtcpwin(&table);
- closedint = now;
- }
-
/*
* Update screen at configured intervals.
*/
@@ -759,37 +738,43 @@ void ipmon(time_t facilitytime, char *ifptr)
updtime = tv;
}
- /*
- * If highlight bar is on some entry, update the flow rate
- * indicator every second.
- */
- unsigned long rate_msecs = timeval_diff_msec(&tv, &tv_rate);
- if (rate_msecs > 1000) {
- update_flowrates(&table, rate_msecs);
+ if (now > last_time.tv_sec) {
+ unsigned long msecs = timeval_diff_msec(&tv, &last_time);
+ /* update all flowrates ... */
+ update_flowrates(&table, msecs);
+ /* ... and print the current one every second */
print_flowrate(&table);
- tv_rate = tv;
+
+ /* print timer at bottom of screen */
+ printelapsedtime(starttime, now, othptbl.obmaxy - 1, 15,
+ othptbl.borderwin);
dropped += packet_get_dropped(fd);
print_packet_drops(dropped, othptbl.borderwin, othptbl.obmaxy - 1, 40);
- }
- /*
- * Terminate facility should a lifetime be specified at the
- * command line
- */
- if ((facilitytime != 0)
- && (((now - starttime) / 60) >= facilitytime))
- exitloop = 1;
+ /* automatically clear closed/timed out entries */
+ if ((options.closedint != 0)
+ && ((now - closedint) / 60 >= options.closedint)) {
+ flushclosedentries(&table, logging, logfile);
+ refreshtcpwin(&table);
+ closedint = now;
+ }
- /*
- * Close and rotate log file if signal was received
- */
- if (logging && (rotate_flag == 1)) {
- announce_rotate_prepare(logfile);
- write_tcp_unclosed(logging, logfile, &table);
- rotate_logfile(&logfile, target_logname);
- announce_rotate_complete(logfile);
- rotate_flag = 0;
+ /* terminate after lifetime specified at the cmdline */
+ if ((facilitytime != 0)
+ && (((now - starttime) / 60) >= facilitytime))
+ exitloop = 1;
+
+ /* close and rotate log file if signal was received */
+ if (logging && (rotate_flag == 1)) {
+ announce_rotate_prepare(logfile);
+ write_tcp_unclosed(logging, logfile, &table);
+ rotate_logfile(&logfile, target_logname);
+ announce_rotate_complete(logfile);
+ rotate_flag = 0;
+ }
+
+ last_time = tv;
}
if (packet_get(fd, &pkt, &ch, table.tcpscreen) == -1) {
--
1.8.4
8:05 a.m.
New subject: [PATCH 19/20] ipmon(): refactor various time computing
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 61 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index c6edc25..acc4a3a 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -585,14 +585,6 @@ void ipmon(time_t facilitytime, char *ifptr)
in_port_t sport = 0, dport = 0; /* TCP/UDP port values */
- struct timeval tv;
- struct timeval last_time;
- time_t starttime = 0;
- time_t now = 0;
- time_t timeint = 0;
- struct timeval updtime;
- time_t closedint = 0;
-
WINDOW *sortwin;
PANEL *sortpanel;
@@ -712,57 +704,66 @@ void ipmon(time_t facilitytime, char *ifptr)
goto err_close;
}
+ packet_init(&pkt);
+
exitloop = 0;
- gettimeofday(&tv, NULL);
- last_time = tv;
- updtime = tv;
- starttime = timeint = closedint = tv.tv_sec;
- packet_init(&pkt);
+ struct timeval now;
+ gettimeofday(&now, NULL);
+ struct timeval last_time = now;
+ struct timeval updtime = now;
+ time_t starttime = now.tv_sec;
+
+ time_t check_closed;
+ if (options.closedint != 0)
+ check_closed = now.tv_sec + options.closedint * 60;
+ else
+ check_closed = INT_MAX;
+
+ /* set the time after which we terminate the process */
+ time_t endtime;
+ if (facilitytime != 0)
+ endtime = now.tv_sec + facilitytime * 60;
+ else
+ endtime = INT_MAX;
while (!exitloop) {
char ifnamebuf[IFNAMSIZ];
- gettimeofday(&tv, NULL);
- now = tv.tv_sec;
-
- /*
- * Update screen at configured intervals.
- */
+ gettimeofday(&now, NULL);
- if (screen_update_needed(&tv, &updtime)) {
+ /* update screen at configured intervals. */
+ if (screen_update_needed(&now, &updtime)) {
show_stats(table.statwin, total_pkts);
update_panels();
doupdate();
- updtime = tv;
+ updtime = now;
}
- if (now > last_time.tv_sec) {
- unsigned long msecs = timeval_diff_msec(&tv, &last_time);
+ if (now.tv_sec > last_time.tv_sec) {
+ unsigned long msecs = timeval_diff_msec(&now, &last_time);
/* update all flowrates ... */
update_flowrates(&table, msecs);
/* ... and print the current one every second */
print_flowrate(&table);
/* print timer at bottom of screen */
- printelapsedtime(starttime, now, othptbl.obmaxy - 1, 15,
+ printelapsedtime(starttime, now.tv_sec, othptbl.obmaxy - 1, 15,
othptbl.borderwin);
dropped += packet_get_dropped(fd);
print_packet_drops(dropped, othptbl.borderwin, othptbl.obmaxy - 1, 40);
/* automatically clear closed/timed out entries */
- if ((options.closedint != 0)
- && ((now - closedint) / 60 >= options.closedint)) {
+ if (now.tv_sec > check_closed) {
flushclosedentries(&table, logging, logfile);
refreshtcpwin(&table);
- closedint = now;
+ check_closed = now.tv_sec + options.closedint * 60;
}
/* terminate after lifetime specified at the cmdline */
- if ((facilitytime != 0)
- && (((now - starttime) / 60) >= facilitytime))
+ if (now.tv_sec > endtime)
exitloop = 1;
/* close and rotate log file if signal was received */
@@ -774,7 +775,7 @@ void ipmon(time_t facilitytime, char *ifptr)
rotate_flag = 0;
}
- last_time = tv;
+ last_time = now;
}
if (packet_get(fd, &pkt, &ch, table.tcpscreen) == -1) {
--
1.8.4
8:05 a.m.
New subject: [PATCH 20/20] ipmon(): simplify timeouted TCP entries handling
Instead of checking for timeouted TCP entries in qt_partition(),
in_table() and flushclosedentries(), just scan the entire list for
timedout entries every second, mark them and list them in the closed
entries list. Their deletion/reuse is the same as for closed entries
(done in flushclosedentries()/addentry()). Also show the timeouted
entries as "TMOU" on the screen.
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/itrafmon.c | 70 ++++++++++++++--------------------------------------------
src/othptab.c | 4 ++--
src/tcptable.c | 70 +++++++++++++++++++++++-----------------------------------
src/tcptable.h | 7 +++---
4 files changed, 50 insertions(+), 101 deletions(-)
diff --git a/src/itrafmon.c b/src/itrafmon.c
index acc4a3a..393d07a 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -391,8 +391,7 @@ static unsigned long long qt_getkey(struct tcptableent *entry, int
ch)
static struct tcptableent *qt_partition(struct tcptable *table,
struct tcptableent **low,
- struct tcptableent **high, int ch,
- int logging, FILE *logfile)
+ struct tcptableent **high, int ch)
{
struct tcptableent *pivot = *low;
@@ -402,51 +401,16 @@ static struct tcptableent *qt_partition(struct tcptable *table,
unsigned long long pivot_value;
- time_t now;
-
pivot_value = qt_getkey(pivot, ch);
- now = time(NULL);
-
while (left->index < right->index) {
while ((qt_getkey(left, ch) >= pivot_value)
- && (left->next_entry->next_entry != NULL)) {
-
- /*
- * Might as well check out timed out entries here too.
- */
- if ((options.timeout > 0)
- && ((now - left->lastupdate) / 60 > options.timeout)
- && (!(left->inclosed))) {
- left->timedout =
- left->oth_connection->timedout = 1;
- addtoclosedlist(table, left);
-
- if (logging)
- write_timeout_log(logging, logfile,
- left);
- }
+ && (left->next_entry->next_entry != NULL))
left = left->next_entry->next_entry;
- }
- while (qt_getkey(right, ch) < pivot_value) {
- /*
- * Might as well check out timed out entries here too.
- */
- if ((options.timeout > 0)
- && ((now - right->lastupdate) / 60 > options.timeout)
- && (!(right->inclosed))) {
- right->timedout =
- right->oth_connection->timedout = 1;
- addtoclosedlist(table, right);
-
- if (logging)
- write_timeout_log(logging, logfile,
- right);
- }
+ while (qt_getkey(right, ch) < pivot_value)
right = right->prev_entry->prev_entry;
- }
if (left->index < right->index) {
swap_tcp_entries(table, left, right);
@@ -478,8 +442,7 @@ static struct tcptableent *qt_partition(struct tcptable *table,
*/
static void quicksort_tcp_entries(struct tcptable *table,
struct tcptableent *low,
- struct tcptableent *high, int ch,
- int logging, FILE *logfile)
+ struct tcptableent *high, int ch)
{
struct tcptableent *pivot;
@@ -488,15 +451,14 @@ static void quicksort_tcp_entries(struct tcptable *table,
if (high->index > low->index) {
pivot =
- qt_partition(table, &low, &high, ch, logging, logfile);
+ qt_partition(table, &low, &high, ch);
if (pivot->prev_entry != NULL)
quicksort_tcp_entries(table, low,
- pivot->prev_entry->prev_entry, ch,
- logging, logfile);
+ pivot->prev_entry->prev_entry, ch);
quicksort_tcp_entries(table, pivot->next_entry->next_entry,
- high, ch, logging, logfile);
+ high, ch);
}
}
@@ -505,8 +467,7 @@ static void quicksort_tcp_entries(struct tcptable *table,
* replaced with a Quicksort algorithm.
*/
-static void sortipents(struct tcptable *table, int ch, int logging,
- FILE *logfile)
+static void sortipents(struct tcptable *table, int ch)
{
if ((table->head == NULL)
|| (table->head->next_entry->next_entry == NULL))
@@ -517,8 +478,7 @@ static void sortipents(struct tcptable *table, int ch, int logging,
if ((ch != 'P') && (ch != 'B'))
return;
- quicksort_tcp_entries(table, table->head, table->tail->prev_entry, ch,
- logging, logfile);
+ quicksort_tcp_entries(table, table->head, table->tail->prev_entry, ch);
table->firstvisible = table->head;
struct tcptableent *ptmp = table->head;
@@ -755,9 +715,11 @@ void ipmon(time_t facilitytime, char *ifptr)
dropped += packet_get_dropped(fd);
print_packet_drops(dropped, othptbl.borderwin, othptbl.obmaxy - 1, 40);
+ mark_timeouted_entries(&table, logging, logfile);
+
/* automatically clear closed/timed out entries */
if (now.tv_sec > check_closed) {
- flushclosedentries(&table, logging, logfile);
+ flushclosedentries(&table);
refreshtcpwin(&table);
check_closed = now.tv_sec + options.closedint * 60;
}
@@ -873,7 +835,7 @@ void ipmon(time_t facilitytime, char *ifptr)
case 'f':
case 'c':
case 'C':
- flushclosedentries(&table, logging, logfile);
+ flushclosedentries(&table);
refreshtcpwin(&table);
break;
case 's':
@@ -894,7 +856,8 @@ void ipmon(time_t facilitytime, char *ifptr)
keymode = 0;
del_panel(sortpanel);
delwin(sortwin);
- sortipents(&table, ch, logging, logfile);
+ flushclosedentries(&table);
+ sortipents(&table, ch);
if (table.barptr != NULL) {
table.barptr = table.firstvisible;
}
@@ -953,8 +916,7 @@ void ipmon(time_t facilitytime, char *ifptr)
struct tcphdr *tcp = (struct tcphdr *)ip_payload;
sockaddr_set_port(&saddr, sport);
sockaddr_set_port(&daddr, dport);
- tcpentry = in_table(&table, &saddr, &daddr, ifname,
- logging, logfile, options.timeout);
+ tcpentry = in_table(&table, &saddr, &daddr, ifname);
/*
* Add a new entry if it doesn't exist, and,
diff --git a/src/othptab.c b/src/othptab.c
index 40acebf..2aa54f5 100644
--- a/src/othptab.c
+++ b/src/othptab.c
@@ -144,7 +144,7 @@ void check_icmp_dest_unreachable(struct tcptable *table, struct
pkt_hdr *pkt,
sockaddr_set_port(&daddr, ntohs(tcp->dest));
/* check if this tcpentry exists */
- tcpentry = in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
+ tcpentry = in_table(table, &saddr, &daddr, ifname);
break; }
case IPPROTO_ICMPV6: {
@@ -167,7 +167,7 @@ void check_icmp_dest_unreachable(struct tcptable *table, struct
pkt_hdr *pkt,
sockaddr_set_port(&daddr, ntohs(tcp->dest));
/* check if this tcpentry exists */
- tcpentry = in_table(table, &saddr, &daddr, ifname, 0, NULL, 0);
+ tcpentry = in_table(table, &saddr, &daddr, ifname);
break; }
default:
diff --git a/src/tcptable.c b/src/tcptable.c
index 06d1572..7693b41 100644
--- a/src/tcptable.c
+++ b/src/tcptable.c
@@ -485,17 +485,36 @@ void write_timeout_log(int logging, FILE *logfile, struct
tcptableent *tcpnode)
}
}
+void mark_timeouted_entries(struct tcptable *table, int logging, FILE *logfile)
+{
+ if (options.timeout == 0)
+ return;
+
+ time_t now = time(NULL);
+ struct tcptableent *ptmp = table->head;
+
+ while (ptmp != NULL) {
+ if (((now - ptmp->lastupdate) / 60 > options.timeout)
+ && !ptmp->inclosed) {
+ ptmp->timedout = 1;
+ ptmp->oth_connection->timedout = 1;
+ addtoclosedlist(table, ptmp);
+
+ if (logging)
+ write_timeout_log(logging, logfile, ptmp);
+ }
+ ptmp = ptmp->next_entry;
+ }
+}
+
struct tcptableent *in_table(struct tcptable *table,
struct sockaddr_storage *saddr,
struct sockaddr_storage *daddr,
- char *ifname, int logging,
- FILE *logfile, time_t timeout)
+ char *ifname)
{
struct tcp_hashentry *hashptr;
unsigned int hp;
- time_t now;
-
if (table->head == NULL) {
return 0;
}
@@ -512,24 +531,6 @@ struct tcptableent *in_table(struct tcptable *table,
&& (strcmp(hashptr->tcpnode->ifname, ifname) == 0))
break;
- now = time(NULL);
-
- /*
- * Add the timed out entries to the closed list in case we didn't
- * find any closed ones.
- */
-
- if ((timeout > 0)
- && ((now - hashptr->tcpnode->lastupdate) / 60 > timeout)
- && (!(hashptr->tcpnode->inclosed))) {
- hashptr->tcpnode->timedout = 1;
- hashptr->tcpnode->oth_connection->timedout = 1;
- addtoclosedlist(table, hashptr->tcpnode);
-
- if (logging)
- write_timeout_log(logging, logfile,
- hashptr->tcpnode);
- }
hashptr = hashptr->next_entry;
}
@@ -869,7 +870,9 @@ void printentry(struct tcptable *table, struct tcptableent
*tableentry)
wattrset(table->tcpscreen, normalattr);
- if (tableentry->finsent == 1)
+ if (tableentry->timedout)
+ strcpy(stat, "TMOU");
+ else if (tableentry->finsent == 1)
strcpy(stat, "DONE");
else if (tableentry->finsent == 2)
strcpy(stat, "CLOS");
@@ -1001,34 +1004,17 @@ static void destroy_tcp_entry(struct tcptable *table, struct
tcptableent *ptmp)
* entries.
*/
-void flushclosedentries(struct tcptable *table, int logging, FILE *logfile)
+void flushclosedentries(struct tcptable *table)
{
struct tcptableent *ptmp = table->head;
struct tcptableent *ctmp = NULL;
unsigned long idx = 1;
unsigned long screen_idx = table->firstvisible->index;
- time_t now;
- time_t lastupdated = 0;
while (ptmp != NULL) {
- now = time(NULL);
- lastupdated = (now - ptmp->lastupdate) / 60;
-
- if ((ptmp->inclosed) || (lastupdated > options.timeout)) {
+ if (ptmp->inclosed) {
ctmp = ptmp;
/*
- * Mark and flush timed out TCP entries.
- */
- if (lastupdated > options.timeout) {
- if ((!(ptmp->timedout)) && (!(ptmp->inclosed))) {
- write_timeout_log(logging, logfile,
- ptmp);
- ptmp->timedout =
- ptmp->oth_connection->timedout = 1;
- }
- }
-
- /*
* Advance to next entry and destroy target entry.
*/
ptmp = ptmp->next_entry;
diff --git a/src/tcptable.h b/src/tcptable.h
index ff692fe..6ee90ad 100644
--- a/src/tcptable.h
+++ b/src/tcptable.h
@@ -115,11 +115,12 @@ struct tcptableent *addentry(struct tcptable *table,
int protocol, char *ifname,
int *rev_lookup, int rvnamedon);
+void mark_timeouted_entries(struct tcptable *table, int logging, FILE *logfile);
+
struct tcptableent *in_table(struct tcptable *table,
struct sockaddr_storage *saddr,
struct sockaddr_storage *daddr,
- char *ifname, int logging,
- FILE *logfile, time_t timeout);
+ char *ifname);
void updateentry(struct tcptable *table, struct pkt_hdr *pkt,
struct tcptableent *tableentry, struct tcphdr *transpacket,
@@ -136,7 +137,7 @@ void refreshtcpwin(struct tcptable *table);
void destroytcptable(struct tcptable *table);
-void flushclosedentries(struct tcptable *table, int logging, FILE *logfile);
+void flushclosedentries(struct tcptable *table);
void write_timeout_log(int logging, FILE *logfile, struct tcptableent *tcpnode);
--
1.8.4
9:39 a.m.
Vitezslav Samel <vitezslav(a)samel.cz> writes:
Vitezslav Samel (20):
ipmon(): remove screen_idx variable
ipmon(): remove baridx variable
ipmon(): move mode variable into struct tcptable
ipmon(): no need to redraw sort win
itrafmon.c: refactor TCP screen scrolling
othptab.c: use struct in_addr for IPv4 address
ipmon(): move dropped packets count
itrafmon.c: refactor other packet screen scrolling
ipmon(): allow scrolling with Home, End keys
tcptable.c: simplify destroy_closed_entries()
tcptable.c: simplify destroytcptable()
struct tcptablent: kill unused starttime variable
updateentry(): rename transpacket variable to tcp
ipmon(): move statwin nad statpanel variables into struct tcptable
ipmon(): move NULL check into print_flowrate()
move_tcp_bar(): print flow rate after moving the bar
itrafmon.c: rename update_flowrate() to update_flowrates()
ipmon(): optimize: move some checks away from the hot path
ipmon(): refactor various time computing
ipmon(): simplify timeouted TCP entries handling
src/itrafmon.c | 575 +++++++++++++++++++++++++--------------------------------
src/othptab.c | 26 +--
src/othptab.h | 4 +-
src/tcptable.c | 268 ++++++++++++---------------
src/tcptable.h | 24 +--
5 files changed, 394 insertions(+), 503 deletions(-)
applied, thanks for nice clean up.
--
Nikola
3609
days inactive
3609
days old
iptraf-ng@lists.fedorahosted.org
21 comments
2 participants
participants (2)
-
Nikola Pajkovsky -
Vitezslav Samel