forked from osmocom/wireshark
330d408328
To allow an arithmetic expressions without spaces, such as "1+2",
we cannot match the expression in other lexical rules using "+". Because
of longest match this becomes the token LITERAL or UNPARSED with semantic value
"1+2". The same goes for all the other arithmetic operators.
So we need to remove [+-*/%] from "word chars" and add very specific
patterns (that won't mistakenly match an arithmetic expression) for
those literal or unparsed tokens we want to support using these characters.
The plus was not a problem but right slash is used for CIDR, minus for
mac address separator, etc.
There are still some corner case. 11-22-33-44-55-66 is a mac
address and not the arithmetic expression with six terms "eleven
minus twenty two minus etc." (if we ever support more than two terms
in the grammar, which we don't currently).
We lift some patterns from the flex manual to match on IPv4 and
IPv6 (ugly) and add MAC address.
Other hypothetical literal lexical values using [+-*/%] are already
supported enclosed in angle brackets but the cases of MAC/IPv4/IPv6 are
are very common and moreover we need to do the utmost to not break backward
compatibily here.
Before:
$ dftest "_ws.ftypes.int32 == 1+2"
dftest: "1+2" is not a valid number.
After:
$ dftest "_ws.ftypes.int32 == 1+2"
Filter: _ws.ftypes.int32 == 1+2
Instructions:
00000 READ_TREE _ws.ftypes.int32 -> reg#0
00001 IF_FALSE_GOTO 4
00002 ADD 1 <FT_INT32> + 2 <FT_INT32> -> reg#1
00003 ANY_EQ reg#0 == reg#1
00004 RETURN
|
||
|---|---|---|
| .. | ||
| 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 | ||
| test.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