diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-10-01 08:13:39 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-10-01 08:13:43 +0000 |
| commit | 797a9bf67dac1b35fa076a44ca81944875be6f1b (patch) | |
| tree | ba156f904db7adf529fe271bb624e19d73d4d04a /docbook | |
| parent | 23e2b1f948af100c93fb52e73be0a0602d7a0b4c (diff) | |
[Automatic update for 2017-10-01]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: I5ba654c9fade87decd26995b5a2d38734dcfba3b
Reviewed-on: https://code.wireshark.org/review/23794
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/wsug_src/capinfos-h.txt | 4 | ||||
| -rw-r--r-- | docbook/wsug_src/dumpcap-h.txt | 6 | ||||
| -rw-r--r-- | docbook/wsug_src/editcap-F.txt | 1 | ||||
| -rw-r--r-- | docbook/wsug_src/editcap-T.txt | 1 | ||||
| -rw-r--r-- | docbook/wsug_src/tshark-h.txt | 6 |
5 files changed, 12 insertions, 6 deletions
diff --git a/docbook/wsug_src/capinfos-h.txt b/docbook/wsug_src/capinfos-h.txt index 122fbbf7ad..97aff0f8a6 100644 --- a/docbook/wsug_src/capinfos-h.txt +++ b/docbook/wsug_src/capinfos-h.txt @@ -1,4 +1,4 @@ -Capinfos (Wireshark) 2.5.0 (v2.5.0rc0-1171-g33c00a67) +Capinfos (Wireshark) 2.5.0 (v2.5.0rc0-1220-g23e2b1f9) Print various information (infos) about capture files. See https://www.wireshark.org for more information. @@ -9,7 +9,7 @@ General infos: -E display the capture file encapsulation -I display the capture file interface information -F display additional capture file information - -H display the SHA1, RMD160, and MD5 hashes of the file + -H display the SHA256, RMD160, and SHA1 hashes of the file -k display the capture comment Size infos: diff --git a/docbook/wsug_src/dumpcap-h.txt b/docbook/wsug_src/dumpcap-h.txt index 7b12048c0c..9b25cbaaf5 100644 --- a/docbook/wsug_src/dumpcap-h.txt +++ b/docbook/wsug_src/dumpcap-h.txt @@ -1,4 +1,4 @@ -Dumpcap (Wireshark) 2.5.0 (v2.5.0rc0-1171-g33c00a67) +Dumpcap (Wireshark) 2.5.0 (v2.5.0rc0-1220-g23e2b1f9) Capture network packets and dump them into a pcapng or pcap file. See https://www.wireshark.org for more information. @@ -52,6 +52,10 @@ Miscellaneous: -v print version information and exit -h display this help and exit +WARNING: dumpcap will enable kernel BPF JIT compiler if available. +You might want to reset it +By doing "echo 0 > /proc/sys/net/core/bpf_jit_enable" + Example: dumpcap -i eth0 -a duration:60 -w output.pcapng "Capture packets from interface eth0 until 60s passed into output.pcapng" diff --git a/docbook/wsug_src/editcap-F.txt b/docbook/wsug_src/editcap-F.txt index 9432529397..9435076251 100644 --- a/docbook/wsug_src/editcap-F.txt +++ b/docbook/wsug_src/editcap-F.txt @@ -1,4 +1,3 @@ -editcap: option requires an argument -- F editcap: The available capture file types for the "-F" flag are: 5views - InfoVista 5View capture btsnoop - Symbian OS btsnoop diff --git a/docbook/wsug_src/editcap-T.txt b/docbook/wsug_src/editcap-T.txt index da0d25463a..5d7e40bc38 100644 --- a/docbook/wsug_src/editcap-T.txt +++ b/docbook/wsug_src/editcap-T.txt @@ -1,4 +1,3 @@ -editcap: option requires an argument -- T editcap: The available encapsulation types for the "-T" flag are: ap1394 - Apple IP-over-IEEE 1394 arcnet - ARCNET diff --git a/docbook/wsug_src/tshark-h.txt b/docbook/wsug_src/tshark-h.txt index 308e5b9b65..4be4189570 100644 --- a/docbook/wsug_src/tshark-h.txt +++ b/docbook/wsug_src/tshark-h.txt @@ -1,4 +1,4 @@ -TShark (Wireshark) 2.5.0 (v2.5.0rc0-1171-g33c00a67) +TShark (Wireshark) 2.5.0 (v2.5.0rc0-1220-g23e2b1f9) Dump and analyze network traffic. See https://www.wireshark.org for more information. @@ -113,3 +113,7 @@ Miscellaneous: -G [report] dump one of several available reports and exit default report="fields" use "-G ?" for more help + +WARNING: dumpcap will enable kernel BPF JIT compiler if available. +You might want to reset it +By doing "echo 0 > /proc/sys/net/core/bpf_jit_enable" |