Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Fix the following compiler warnings that occur when building with "-W -Wall":
pcap_sg.c: In function ‘__pcap_sg_inter_iov_hdr_read’:
pcap_sg.c:46:89: warning: unused parameter ‘type’ [-Wunused-parameter]
pcap_sg.c:47:19: warning: unused parameter ‘packet’ [-Wunused-parameter]
pcap_sg.c:47:34: warning: unused parameter ‘len’ [-Wunused-parameter]
pcap_sg.c: In function ‘__pcap_sg_inter_iov_data_read’:
pcap_sg.c:77:78: warning: unused parameter ‘len’ [-Wunused-parameter]
pcap_sg.c: In function ‘pcap_sg_prepare_access’:
pcap_sg.c:163:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
pcap_sg.c: In function ‘pcap_sg_prepare_close’:
pcap_sg.c:184:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
pcap_sg.c:180:39: warning: unused parameter ‘fd’ [-Wunused-parameter]
pcap_sg.c:180:58: warning: unused parameter ‘mode’ [-Wunused-parameter]
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
In order to avoid compiler warnings when compiling with
-W/-Wunused-parameter, mark unused function parameters with
__maybe_unused.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
array_size() returns size_t, thus make iterator variables comparing
against it size_t too to avoid a warning regarding comparison of
signed/unsigned.
Also cast some ssize_t variables passed to min() for the same reason.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
This should be ``numeric'' instead of ``nemeric''.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Add -C option to zsh support.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Add -m and -W options to zsh support.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
The sll parameter is not used anywhere in the function, so remove it.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
array_size() returns size_t, thus make i size_t too to avoid a warning
regarding comparison of signed/unsigned.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Place a newline after GIT_PEOPLE in the mail announcement target.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Use git describe --always in the Makefile instead of git describe
as it can fail otherwise.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
In order to avoid compiler warnings when compiling with
-W/-Wunused-parameter, mark unused function parameters with
__maybe_unused.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Fix the following warning when compiling with
-W/-Wsign-compare/-Wunused-parameter:
tprintf.c: In function ‘__tprintf_flush_skip’:
tprintf.c:54:65: warning: unused parameter ‘max’ [-Wunused-parameter]
tprintf.c: In function ‘__tprintf_flush’:
tprintf.c:70:16: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
tprintf.c:76:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
tprintf.c:80:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
tprintf.c: In function ‘tprintf’:
tprintf.c:131:10: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
There have been minor updates after letting the script run.
Some are spelling fixes, some modified entries.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
For systems with >8 CPUs it might be i) annoying or ii) uninteresting
to print CPU time statistics. So introduce a switch that can skip this
at exit.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Those are the last occurences of warnings like:
netsniff-ng.c:697:48: warning: Using plain integer as NULL pointer
netsniff-ng.c:726:48: warning: Using plain integer as NULL pointer
...
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
In order to avoid compiler warnings when compiling with
-W/-Wunused-parameter, mark unused function parameters with
__maybe_unused.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Commit bf9232fb6 ("trafgen: setup_shared_var: fix couple of things")
forgot to amend the remaining changes in 'len' usage. So lets fix
them right now.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
This patch fixes the followingf sparse warning:
proto_80211_mac_hdr.c:3389:24: warning: Using plain integer as NULL pointer
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
sparse reported that the variable seed can be made static:
trafgen.c:110:14: warning: symbol 'seed' was not declared. Should it be static?
While at it, also rename a local variable 'seed' to not overlap
contexts.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
array_size() returns size_t, thus make i size_t too to avoid a warning
regarding comparison of signed/unsigned.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
1) Fix a couple of sparse warnings:
trafgen.c:382:27: error: cannot size expression
trafgen.c:391:33: error: cannot size expression
trafgen.c:393:33: error: cannot size expression
trafgen.c:401:25: error: cannot size expression
2) Use MAP_FAILED instead of (void *) -1
3) No need to cast to void * on mmap(2)
4) Use NULL instead of 0 as mmap(2)'s first argument
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Found by sparse:
ring_rx.c:155:44: warning: Unknown escape '%'
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
term_csv() doesn't use the ifname and ms_interval parameters, they're
only used in term_csv_header(). Thus remove them from term_csv().
This fixes a warning when compiling with -W/-Wunused-parameter.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Since get_number_cpus() now returns unsigned int store it's return value
and derived values in unsigned int variables as well.
This fixes the some warnings when compiling with -W/-Wsign-compare:
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Those are fixes for the following warnings:
pcap_mm.c:119:29: warning: Using plain integer as NULL pointer
pcap_mm.c:141:29: warning: Using plain integer as NULL pointer
ring.c:24:31: warning: Using plain integer as NULL pointer
flowtop.c:1114:22: warning: Using plain integer as NULL pointer
ifpps.c:1133:29: warning: Using plain integer as NULL pointer
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
This fixes the following sparse warnings:
dissector_eth.c:43:16: warning: Using plain integer as NULL pointer
dissector_eth.c:48:16: warning: Using plain integer as NULL pointer
dissector_eth.c:53:16: warning: Using plain integer as NULL pointer
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Make this conform to trafgen/netsniff-ng and reduce it to 1 line
description.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
The stack trace of valgrind --leak-check=full --show-reachable=yes ifpps \
-lpcd wlan0 showed that at exit members from stats are still reachable.
They have been alloced through stats_alloc, but not freed.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
It is possible to use a interval even of 0, although it would not
really make sense. It's not a bug either, so throw a warning to the
user in that case on 1Gbit/s.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
ifpps always reported the same values for median as for average in the
CPU load fields (usr, sys, idle, iowait). This is of course incorrect.
The bug was due to 3 sub-problems:
- Summing up long double values (m_cpu_*) in an uint64_t (all)
- Not using %Lf (for long double) in mvwprintw()
- Explicitely use floating point division in MEDIAN_EVEN
Fix the bug by summing up in a separate accumulator of type long double,
use the correct format string for long double and divide by 2.0 in
MEDIAN_EVEN to force the result to be (long) double.
Reported-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Instead of (more or less) arbitrarily listing the command line options,
sort them according to the following rule:
- options with required argument, alphabetically by short option
- options without argument, alphabetically by short option
- common options -v/--version and -h/--help
Do this in the short options string, the long options struct, the
in-program usage and the man page.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Add whitespace padding in one occurence of 'med:' output.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Ignore the config.log file in Git as this is automatically generated.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
This was missing in commit 971b1d95 ("ifpps: Optionally display median
values for CPU load and interrupts"). Update the usage to reflect the
changes too.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
Using the -m/--median command line option, median values across all CPUs
are displayed for CPU load, interrupts per interval, sw interrupts per
interval and absolute number of interrupts.
Also update the manpage accordingly.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
We have to pass NEED_TCPDUMP_LIKE_FILTER define through gcc as it
otherwise is not possible to let the pcap compiler invoke through
netsniff-ng, but not through astraceroute.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Not sure how this came in with the last commit, but fix it to the
correct format.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
On errors in the configuration, redirect everything to config.log,
and not some parts to config.log and some others to $TMPDIR/config.log.
This will give a nice summary of what goes wrong to the user. Also,
in case everything looks fine, the config.log file will be created,
but with size 0 and no warning is thrown. So looks good.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
It looks like there are some incompatibilities in bash's expr match
among different versions. Using set -x, gives us on bash 4.2.45:
+ TOOLS=' netsniff-ng trafgen ifpps bpfc'
+ for tool in '$_tools'
+ case "$tool" in
++ expr match '"curvetun' 'astraceroute"' '$1'
expr: syntax error
+ m=
+ '[' '' == 0 ']'
So rather avoid using "expr match" and switch to "case" for substring
matching, which should be more portable.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
tools_remove "libnetfilter-conntrack" makes no sense, so replace it
with the actual correct tools_remove "flowtop".
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
If pkg-config doesn't find a library it prints an error to stderr.
Instead of directly printing them as part of the configure output,
redirect them to config.log and let the user know about it in case there
are any messages.
Suggested-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
|
When running ifpps on systems with 16, 32 or more CPUs, 'avg:...'
field is not being padded with witespaces as the rest of the CPU
lines. This patch does that.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Collecting device statistics on high speed every second can be very
costly, so warn about this in ncurses mode.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
In Fedora or RHEL/CentOS releases the machine type is already part
of the package name, so show it only, if it does not appear there.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Lets make the headline output a bit more useful and show the current
kernel version and well as the machine/hardware type.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
In case some in the near future NICs with 40Gbit/s will appear. Allow
ifpps to get the correct ethtool speed.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
If will now look like the following:
cpu6 +: 237357 irqs
cpu2 |: 117538 irqs
cpu0 |: 8419 irqs
cpu7 |: 4523 irqs
cpu5 |: 4312 irqs
cpu1 -: 1432 irqs
avg: 47606.8
This makes it a bit more precise/intuitive that we sort from max
to min.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
In order to get a better overview, lets align the avg numbers to the
other shown decimals. However, for this we would need to remove the
avg units as we deal with floats here. But we know the units from the
above numbers anyway. I think this makes it more clear to follow.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|
|
Just a whitespace fix to align the strings to the fmt string.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
|