diff options
author | Daniel Borkmann <dborkman@redhat.com> | 2013-05-15 11:29:34 +0200 |
---|---|---|
committer | Daniel Borkmann <dborkman@redhat.com> | 2013-05-15 11:29:34 +0200 |
commit | 2febd57f87eb4d994481d981370c0cd051754539 (patch) | |
tree | db4661560350298712243831931ca354483bf294 /netsniff-ng.8 | |
parent | 3c6e23848af9d0798b98d9f022b7086605f11e99 (diff) | |
parent | 84d5f6dd4987bb78f85a706b0fc689d5b51bbba0 (diff) |
Merge branch 'master' of github.com:borkmann/netsniff-ng
Conflicts resolved by hand:
bpfc.8
ifpps.8
netsniff-ng.8
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'netsniff-ng.8')
-rw-r--r-- | netsniff-ng.8 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/netsniff-ng.8 b/netsniff-ng.8 index 2bf2e8b..573a360 100644 --- a/netsniff-ng.8 +++ b/netsniff-ng.8 @@ -63,7 +63,7 @@ determined automatically by the pcap file magic. In case of stdin, it is assumed that the input stream is a pcap file. .PP .SS -o <dev|pcap|dir|cfg|->, --out <dev|pcap|dir|cfg|-> -Defines the output device, that can either be a networking device, a pcap file, +Defines the output device. This can either be a networking device, a pcap file, a folder, a trafgen(8) configuration file or stdout (\[lq]-\[rq]). In the case of a pcap file that should not have the default pcap type (0xa1b2c3d4), the additional option \[lq]-T\[rq] must be provided. If a directory is given, then, instead of a @@ -126,7 +126,7 @@ used. Pcap files with swapped endianess are also supported. .PP .SS -D, --dump-pcap-types Dump all available pcap types with their capabilities and magic numbers that -can be used with option \[lq]-T\[rq] and exit. +can be used with option \[lq]-T\[rq] to stdout and exit. .PP .SS -B, --dump-bpf If a Berkeley Packet Filter is given, for example via option \[lq]-f\[rq], then @@ -164,7 +164,7 @@ default the size is determined based on the network connectivity rate. .PP .SS -k <uint>, --kernel-pull <uint> Manually define the interval in micro-seconds where the kernel should be triggered -to batch process the ring buffer frames. On default, it is every 10us, but it can +to batch process the ring buffer frames. By default, it is every 10us, but it can manually be prolonged, for instance. .PP .SS -b <cpu>, --bind-cpu <cpu> @@ -211,10 +211,10 @@ addresses can be placed into geoip.conf, separated by a newline. Be more verbose during startup, that is to say, show detailed ring setup information. .PP .SS -v, --version -Show version information. +Show version information and exit. .PP .SS -h, --help -Show user help. +Show user help and exit. .PP .SH USAGE EXAMPLE .PP |