... and this is the end: now the options.actmode is used only in places
where it is actually used
Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz>
---
src/detstats.c | 18 +++++++++---------
src/hostmon.c | 14 ++++++--------
src/ifstats.c | 8 ++++----
src/itrafmon.c | 2 +-
src/rate.c | 9 +++++----
src/rate.h | 4 ++--
src/serv.c | 12 ++++++------
7 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/detstats.c b/src/detstats.c
index 5dddc47..efe7d1c 100644
--- a/src/detstats.c
+++ b/src/detstats.c
@@ -139,22 +139,22 @@ static void writedstatlog(char *ifname,
fprintf(fd, "\nAverage rates:\n");
- rate_print(ts->total.proto_total.pc_bytes / nsecs, options.actmode, bps_string,
sizeof(bps_string));
+ rate_print(ts->total.proto_total.pc_bytes / nsecs, bps_string, sizeof(bps_string));
rate_print_pps(ts->total.proto_total.pc_packets / nsecs, pps_string,
sizeof(pps_string));
fprintf(fd, " Total:\t%s, %s\n", bps_string, pps_string);
- rate_print(ts->total.proto_in.pc_bytes / nsecs, options.actmode, bps_string,
sizeof(bps_string));
+ rate_print(ts->total.proto_in.pc_bytes / nsecs, bps_string, sizeof(bps_string));
rate_print_pps(ts->total.proto_in.pc_packets / nsecs, pps_string,
sizeof(pps_string));
fprintf(fd, " Incoming:\t%s, %s\n", bps_string, pps_string);
- rate_print(ts->total.proto_out.pc_bytes / nsecs, options.actmode, bps_string,
sizeof(bps_string));
+ rate_print(ts->total.proto_out.pc_bytes / nsecs, bps_string, sizeof(bps_string));
rate_print_pps(ts->total.proto_out.pc_packets / nsecs, pps_string,
sizeof(pps_string));
fprintf(fd, " Outgoing:\t%s, %s\n", bps_string, pps_string);
- rate_print(peakactivity, options.actmode, bps_string, sizeof(bps_string));
+ rate_print(peakactivity, bps_string, sizeof(bps_string));
rate_print_pps(peakpps, pps_string, sizeof(pps_string));
fprintf(fd, "\nPeak total activity: %s, %s\n", bps_string, pps_string);
- rate_print(peakactivity_in, options.actmode, bps_string, sizeof(bps_string));
+ rate_print(peakactivity_in, bps_string, sizeof(bps_string));
rate_print_pps(peakpps_in, pps_string, sizeof(pps_string));
fprintf(fd, "Peak incoming rate: %s, %s\n", bps_string, pps_string);
- rate_print(peakactivity_out, options.actmode, bps_string, sizeof(bps_string));
+ rate_print(peakactivity_out, bps_string, sizeof(bps_string));
rate_print_pps(peakpps_out, pps_string, sizeof(pps_string));
fprintf(fd, "Peak outgoing rate: %s, %s\n\n", bps_string, pps_string);
}
@@ -438,15 +438,15 @@ void detstats(char *iface, time_t facilitytime, struct filterstate
*ofilter)
start_tv = tv;
wattrset(statwin, HIGHATTR);
- rate_print(activity, options.actmode, buf, sizeof(buf));
+ rate_print(activity, buf, sizeof(buf));
mvwprintw(statwin, 14, 19, "%s", buf);
rate_print_pps(pps, buf, sizeof(buf));
mvwprintw(statwin, 15, 19, "%s", buf);
- rate_print(activity_in, options.actmode, buf, sizeof(buf));
+ rate_print(activity_in, buf, sizeof(buf));
mvwprintw(statwin, 17, 19, "%s", buf);
rate_print_pps(pps_in, buf, sizeof(buf));
mvwprintw(statwin, 18, 19, "%s", buf);
- rate_print(activity_out, options.actmode, buf, sizeof(buf));
+ rate_print(activity_out, buf, sizeof(buf));
mvwprintw(statwin, 20, 19, "%s", buf);
rate_print_pps(pps_out, buf, sizeof(buf));
mvwprintw(statwin, 21, 19, "%s", buf);
diff --git a/src/hostmon.c b/src/hostmon.c
index bbf993b..341a4a2 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -127,18 +127,16 @@ static void writeethlog(struct ethtabent *list, unsigned long nsecs,
FILE *fd)
fprintf(fd, "\tAverage rates: ");
char buf_in[32];
char buf_out[32];
- rate_print(ptmp->un.figs.inbcount / nsecs, options.actmode,
- buf_in, sizeof(buf_in));
- rate_print(ptmp->un.figs.outbcount / nsecs, options.actmode,
- buf_out, sizeof(buf_out));
+ rate_print(ptmp->un.figs.inbcount / nsecs, buf_in, sizeof(buf_in));
+ rate_print(ptmp->un.figs.outbcount / nsecs, buf_out, sizeof(buf_out));
fprintf(fd, "%s incoming, %s outgoing\n",
buf_in, buf_out);
if (nsecs > 5) {
rate_print(rate_get_average(&ptmp->un.figs.inrate),
- options.actmode, buf_in, sizeof(buf_in));
+ buf_in, sizeof(buf_in));
rate_print(rate_get_average(&ptmp->un.figs.outrate),
- options.actmode, buf_out, sizeof(buf_out));
+ buf_out, sizeof(buf_out));
fprintf(fd,
"\tLast 5-second rates: %s incoming, %s outgoing\n",
buf_in, buf_out);
@@ -417,12 +415,12 @@ static void printrates(struct ethtab *table, unsigned int
target_row,
char buf[32];
rate_print_no_units(rate_get_average(&ptmp->un.figs.inrate),
- options.actmode, buf, sizeof(buf));
+ buf, sizeof(buf));
wmove(table->tabwin, target_row, 32 * COLS / 80);
wprintw(table->tabwin, "%s", buf);
rate_print_no_units(rate_get_average(&ptmp->un.figs.outrate),
- options.actmode, buf, sizeof(buf));
+ buf, sizeof(buf));
wmove(table->tabwin, target_row, 69 * COLS / 80);
wprintw(table->tabwin, "%s", buf);
}
diff --git a/src/ifstats.c b/src/ifstats.c
index 8632877..35a5e18 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -94,11 +94,11 @@ static void writegstatlog(struct iftab *table, unsigned long nsecs,
FILE *fd)
if (nsecs > 5) {
char buf[64];
- rate_print(ptmp->br / nsecs, options.actmode, buf, sizeof(buf));
+ rate_print(ptmp->br / nsecs, buf, sizeof(buf));
fprintf(fd, ", average activity %s", buf);
- rate_print(ptmp->peakrate, options.actmode, buf, sizeof(buf));
+ rate_print(ptmp->peakrate, buf, sizeof(buf));
fprintf(fd, ", peak activity %s", buf);
- rate_print(rate_get_average(&ptmp->rate), options.actmode, buf, sizeof(buf));
+ rate_print(rate_get_average(&ptmp->rate), buf, sizeof(buf));
fprintf(fd, ", last 5-second average activity %s", buf);
}
fprintf(fd, "\n");
@@ -266,7 +266,7 @@ static void updaterates(struct iftab *table, unsigned long msecs,
do {
rate_add_rate(&ptmp->rate, ptmp->spanbr, msecs);
rate = rate_get_average(&ptmp->rate);
- rate_print(rate, options.actmode, buf, sizeof(buf));
+ rate_print(rate, buf, sizeof(buf));
wmove(table->statwin, ptmp->index - idx, 63 * COLS / 80);
wprintw(table->statwin, "%s", buf);
diff --git a/src/itrafmon.c b/src/itrafmon.c
index 8188f3e..fe1771a 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -537,7 +537,7 @@ static void print_flowrate(struct tcptableent *entry, WINDOW *win)
wattrset(win, IPSTATATTR);
char buf[32];
- rate_print(rate_get_average(&entry->rate), options.actmode, buf, sizeof(buf));
+ rate_print(rate_get_average(&entry->rate), buf, sizeof(buf));
mvwprintw(win, 0, COLS * 52 / 80 + 13, "%s", buf);
}
diff --git a/src/rate.c b/src/rate.c
index 98c4cf2..7b08852 100644
--- a/src/rate.c
+++ b/src/rate.c
@@ -2,6 +2,7 @@
/* For authors and contributors see the AUTHORS file */
#include "iptraf-ng-compat.h"
+#include "options.h"
#include "rate.h"
void rate_init(struct rate *rate)
@@ -66,14 +67,14 @@ unsigned long rate_get_average(struct rate *rate)
return 0UL;
}
-int rate_print(unsigned long rate, int dispmode, char *buf, unsigned n)
+int rate_print(unsigned long rate, char *buf, unsigned n)
{
char *suffix[] = { "k", "M", "G", "T",
"P", "E", "Z", "Y" };
unsigned n_suffix = ARRAY_SIZE(suffix);
int chars;
- if (dispmode == KBITS) {
+ if (options.actmode == KBITS) {
unsigned long tmp = rate;
unsigned int i = 0;
unsigned long divider = 1000;
@@ -105,11 +106,11 @@ int rate_print(unsigned long rate, int dispmode, char *buf, unsigned
n)
return chars;
}
-int rate_print_no_units(unsigned long rate, int dispmode, char *buf, unsigned n)
+int rate_print_no_units(unsigned long rate, char *buf, unsigned n)
{
int chars;
- if (dispmode == KBITS) {
+ if (options.actmode == KBITS) {
chars = snprintf(buf, n, "%8.1f", (double)rate * 8 / 1000);
} else {
chars = snprintf(buf, n, "%8.1f", (double)rate / 1024);
diff --git a/src/rate.h b/src/rate.h
index 266dd28..871d8e5 100644
--- a/src/rate.h
+++ b/src/rate.h
@@ -29,8 +29,8 @@ void rate_destroy(struct rate *rate);
void rate_add_rate(struct rate *rate, unsigned long bytes,
unsigned long msecs);
unsigned long rate_get_average(struct rate *rate);
-int rate_print(unsigned long rate, int dispmode, char *buf, unsigned n);
-int rate_print_no_units(unsigned long rate, int dispmode, char *buf, unsigned n);
+int rate_print(unsigned long rate, char *buf, unsigned n);
+int rate_print_no_units(unsigned long rate, char *buf, unsigned n);
int rate_print_pps(unsigned long rate, char *buf, unsigned n);
#endif /* IPTRAF_NG_RATE_H */
diff --git a/src/serv.c b/src/serv.c
index 66c22d3..738c7ec 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -118,7 +118,7 @@ static void writeutslog(struct portlistent *list, unsigned long nsecs,
FILE *fd)
ptmp->serv_count.proto_total.pc_packets,
ptmp->serv_count.proto_total.pc_bytes);
- rate_print(ptmp->serv_count.proto_total.pc_bytes / secs, options.actmode,
+ rate_print(ptmp->serv_count.proto_total.pc_bytes / secs,
bps_string, sizeof(bps_string));
fprintf(fd, ", %s", bps_string);
@@ -126,7 +126,7 @@ static void writeutslog(struct portlistent *list, unsigned long nsecs,
FILE *fd)
ptmp->serv_count.proto_in.pc_packets,
ptmp->serv_count.proto_in.pc_bytes);
- rate_print(ptmp->serv_count.proto_in.pc_bytes / secs, options.actmode,
+ rate_print(ptmp->serv_count.proto_in.pc_bytes / secs,
bps_string, sizeof(bps_string));
fprintf(fd, ", %s", bps_string);
@@ -134,7 +134,7 @@ static void writeutslog(struct portlistent *list, unsigned long nsecs,
FILE *fd)
ptmp->serv_count.proto_out.pc_packets,
ptmp->serv_count.proto_out.pc_bytes);
- rate_print(ptmp->serv_count.proto_out.pc_bytes / secs, options.actmode,
+ rate_print(ptmp->serv_count.proto_out.pc_bytes / secs,
bps_string, sizeof(bps_string));
fprintf(fd, ", %s", bps_string);
@@ -730,11 +730,11 @@ static void print_serv_rates(struct portlistent *ple, WINDOW *win)
mvwprintw(win, 0, 76, "out");
wattrset(win, IPSTATATTR);
- rate_print(rate_get_average(&ple->rate), options.actmode, buf, sizeof(buf));
+ rate_print(rate_get_average(&ple->rate), buf, sizeof(buf));
mvwprintw(win, 0, 21, "%s", buf);
- rate_print(rate_get_average(&ple->rate_in), options.actmode, buf, sizeof(buf));
+ rate_print(rate_get_average(&ple->rate_in), buf, sizeof(buf));
mvwprintw(win, 0, 42, "%s", buf);
- rate_print(rate_get_average(&ple->rate_out), options.actmode, buf, sizeof(buf));
+ rate_print(rate_get_average(&ple->rate_out), buf, sizeof(buf));
mvwprintw(win, 0, 61, "%s", buf);
}
--
1.7.8.4