563307ff6b
When we have multiple capture sources, for each one that is a pcapng source and supplies its own IDBs, don't create a fake IDB with invalid linktype WTAP_ENCAP_UNKNOWN and write it to the output file. Instead, use the IDBs from the source, remapping them as necessary. For non-pcapng sources, store the output IDB interface ID and write EPBs using that, since now the input interface ID and the output interface ID are not necessarily the same, if some of the other sources are not pcapng. Update the capture tests that use multiple FIFO sources, because now we don't add two extra IDBs, one for each FIFO. Instead there are 3 * 11 == 33 total IDBs. This prevents some various incompatibilites in Wireshark and other tools when a file has interfaces of more than one link type, and also has IDBs with an illegal WTAP_ENCAP_UNKNOWN link type. Fix #19080 |
||
|---|---|---|
| .. | ||
| baseline | ||
| captures | ||
| config | ||
| keys | ||
| lua | ||
| protobuf_lang_files | ||
| suite_dfilter | ||
| suite_dissectors | ||
| README.test | ||
| conftest.py | ||
| fixtures.py | ||
| fixtures_ws.py | ||
| hosts.custom | ||
| hosts.global | ||
| hosts.personal | ||
| matchers.py | ||
| sampleif.py | ||
| subprocesstest.py | ||
| suite_capture.py | ||
| suite_clopts.py | ||
| suite_decryption.py | ||
| suite_dissection.py | ||
| suite_extcaps.py | ||
| suite_external.py | ||
| suite_fileformats.py | ||
| suite_follow.py | ||
| suite_follow_dccp.py | ||
| suite_follow_multistream.py | ||
| suite_io.py | ||
| suite_mergecap.py | ||
| suite_nameres.py | ||
| suite_netperfmeter.py | ||
| suite_outputformats.py | ||
| suite_release.py | ||
| suite_sharkd.py | ||
| suite_text2pcap.py | ||
| suite_unittests.py | ||
| suite_wslua.py | ||
| travis-upload-artifacts.sh | ||
| util_dump_dhcp_pcap.py | ||
README.test
Wireshark Tests The recommended steps to prepare for and to run tests: * Install two Python packages, pytest: `pip install pytest pytest-xdist` * Build programs (“wireshark”, “tshark”, etc.): `ninja` * Build additional programs for the “unittests” suite: `ninja test-programs` * Run tests in the build directory: `pytest` Replace `ninja test-programs` by `make test-programs` as needed. See the “Wireshark Tests” chapter of the Developer's Guide for details: https://www.wireshark.org/docs/wsdg_html_chunked/ChapterTests.html If you need to update the baseline files use the following commands (on a Linux system) mkdir ~/.config/wireshark/profiles/ctest TZ=UTC WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 build/run/tshark -C ctest -T ek -r test/captures/dhcp.pcap > test/baseline/dhcp.ek TZ=UTC WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 build/run/tshark -C ctest -T json -r test/captures/dhcp.pcap > test/baseline/dhcp.json TZ=UTC WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 build/run/tshark -C ctest -T jsonraw -r test/captures/dhcp.pcap > test/baseline/dhcp.jsonraw TZ=UTC WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 build/run/tshark -C ctest -T ek -r test/captures/dhcp.pcap -x > test/baseline/dhcp-raw.ek