aboutsummaryrefslogtreecommitdiffstats
path: root/test
AgeCommit message (Collapse)AuthorFilesLines
2015-09-28Fix tests to allow selection of suite 10Graham Bloice1-48/+23
The tests only allowed a single character suite selection, which prevented suite 10 from being run on its own. Modified test.sh to now require a newline in addition to the input so that a 2 digit number can be entered. Also fixed test display to remove illusion that an individual step could be run. Only whole suites can be run. Change-Id: I4dee0ec6a8e1f34fa443a6a0a3f2d52a73146e54 Reviewed-on: https://code.wireshark.org/review/10676 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-09-23Add a test to verify we pre-allocated enough hf entries.Jeff Morriss1-0/+7
This way we'll know as soon as we drop below the pre-allocated limit. As suggested by Graham on https://code.wireshark.org/review/10601 Change-Id: Ieeb14bdcf991d7a67c30787c97ca24ebb35d1763 Reviewed-on: https://code.wireshark.org/review/10627 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-20Get the windows buildbot working for mergecap test suiteHadriel Kaplan1-15/+15
Change-Id: Ic9351b9bb8df85086eee3ab21908a2f9a04db767 Reviewed-on: https://code.wireshark.org/review/10141 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Try to debug merge test suite failure on windows buildbotHadriel Kaplan1-6/+13
This change will be undone once the problem is found. Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1 Reviewed-on: https://code.wireshark.org/review/10136 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Mergecap: add test suite for various merging scenariosHadriel Kaplan7-3/+265
Add a test suite for mergecap (and indirectly capinfos I guess). This is not exhaustive, but it's a start. Change-Id: I9442b4c32e31a74b1673961ad6ab50821441de3e Reviewed-on: https://code.wireshark.org/review/10082 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-24Lua: add the 1.12.x Lua API to the globals verification test suiteHadriel Kaplan2-0/+1266
Change-Id: I698fc75dc915ea007b2f7762f0041dbb6dd1d8d3 Reviewed-on: https://code.wireshark.org/review/9764 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-17Remove the debugging output; it's now attached to the bug.Guy Harris1-6/+0
Change-Id: I6a9252d2841fc44c6fdb6bd27517d60570afbae0 Reviewed-on: https://code.wireshark.org/review/9695 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17In the p < q test, first run tshark -V, to see the full dissection.Guy Harris1-2/+2
Change-Id: I7d82d34369d192e7da7d554f44f448e1613f850f Reviewed-on: https://code.wireshark.org/review/9694 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17Dump the output of tshark in the p < q decryption test.Guy Harris1-2/+4
See what it prints on Windows. Change-Id: Id35d87595543eca3e5b5d80dbe9a7639e0a85994 Reviewed-on: https://code.wireshark.org/review/9693 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17Don't discard the echo command's output.Guy Harris1-1/+1
Change-Id: I957a0c1beeae4bbd8c32ed05f30525becaf37e95 Reviewed-on: https://code.wireshark.org/review/9682 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17OK, that didn't do it - print the command again.Guy Harris1-0/+4
Too bad DEC used / as an option character and Bell Labs chose it as a pathname separator. Change-Id: Ie58ba79476e0f24e408fae55f6c5eaff3ffb11fa Reviewed-on: https://code.wireshark.org/review/9680 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17Generate key paths as UN*X paths and then run them through cygpath.Guy Harris1-5/+10
In the decryption_step_ssl_rsa_pq - and the decryption_step_ssl_master_secret test - duplicate the code used to generate TEST_KEYS_DIR, so that we construct a UN*X-style path and then, if we're running on Windows, map the UN*X-style path, which is a Cygwin path, to the equivalent Windows-style path, and pass that to TShark on the command line. Bug: 11372 Change-Id: I442a30c4c954540a05942ed70ec3687941428a96 Reviewed-on: https://code.wireshark.org/review/9675 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-17Temporarily log the command that's failing.Guy Harris1-0/+3
Trying to debug the problem. Change-Id: I26f78e49556cb1d40f0c8ddbfd58f058dceb0e77 Reviewed-on: https://code.wireshark.org/review/9674 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-16test: fix RSA decryption test under WindowsPeter Wu1-1/+1
TEST_KEYS_DIR already contains a trailing slash. Windows does not like forward slashes, so drop the additional slash to fix tests under Windows. Fixes: v1.99.8rc0-417-g85f8a99 Bug: 11372 Change-Id: Ief794977281b70549369c344a193f4d48bcc1776 Reviewed-on: https://code.wireshark.org/review/9668 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-15ssl-utils: fix failing decryption for some RSA keysPeter Wu3-0/+31
Reported at https://ask.wireshark.org/questions/43788/struggling-to-decrypt-ssl "u" requirement is documented at https://www.gnupg.org/documentation/manuals/gcrypt/RSA-key-parameters.html#RSA-key-parameters Add regression test (key is generated manually with p and q swapped and qInv recalculated). Change-Id: I5505ddcdb54bb47d7a58867b8c3e53fcc0f66dde Reviewed-on: https://code.wireshark.org/review/9573 Tested-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-07-09Lua: add functions for more field informationHadriel Kaplan1-0/+34
Add Lua functions so a plugin can introspect field information, such as the type of field, flags, tvb, etc. Also add a couple of Tvb and ByteArray methods. And cleanup the TreeItem code a little. Change-Id: I7b58ce589ace91cce14b8abccd01ceabb63e2653 Reviewed-on: https://code.wireshark.org/review/6500 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-06-23Exit with the exit status of the command we ran.Guy Harris1-1/+6
Also, expand a comment. Change-Id: Icbb8ead02f55087f3ac09747fe518f211d488172 Reviewed-on: https://code.wireshark.org/review/9057 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-23Try to catch TShark crashing and get a stack trace.Guy Harris1-1/+1
It's currently crashing in the Solaris buildbot when we do "tshark -v"; hopefully this will give us something more useful than test.sh: line 144: 21543 Abort (core dumped) $TSHARK -v "Version information" Failed! Failed to print version information Binary file ./core matches as a diagnostic. Change-Id: I278c8dd9f6acf5ddfa83bc0a7f3f7a3c48577ac2 Reviewed-on: https://code.wireshark.org/review/9052 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-08Debugging printf.Guy Harris1-0/+1
The buildbot printed "expr: syntax error", presumably from this, but that oh-so-descriptive error message doesn't indicate what the problem is, and just about any string should be valid as the left-hand operand of the : operator. Change-Id: I1140522357b8df07e4183bf0eb8c5fa9fbe275e4 Reviewed-on: https://code.wireshark.org/review/8827 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-04Fix decryption test suite on WindowsPascal Quantin2-1/+1
Change-Id: Ib8207d56a7e064855ce1444c927913c9c9258788 Reviewed-on: https://code.wireshark.org/review/8766 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-04SSL: Add support for private key password when decryptingKevin Grigorenko3-0/+15
SSL traffic from tshark with -o ssl.keys_list. For example, as used in a new test also added in this commit: -o "ssl.keys_list: 127.0.0.1,9131,http,$TEST_KEYS_DIR/key.p12,WebAS" Change-Id: Ia6960fa4ae88182277f6d22d84ec9170ea74d54e Reviewed-on: https://code.wireshark.org/review/8746 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-11Try to handle the executable being a libtool wrapper.Guy Harris1-2/+29
Change-Id: I8fd2b4445707029ea24ad3c02804c0bf8fcedd15 Reviewed-on: https://code.wireshark.org/review/8406 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-11Remove trailing whitespace.Guy Harris1-1/+1
Change-Id: Ibdb899ddcaa88579aa2dc3c842d016a1ac164e2a Reviewed-on: https://code.wireshark.org/review/8404 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-11Skip past env and its environment-variable arguments.Guy Harris1-1/+20
Change-Id: Ic0bec27e5884a1e5db8e98e6d84b677ae8b2d377 Reviewed-on: https://code.wireshark.org/review/8403 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-11Try to get a stack trace from core dumps.Guy Harris1-7/+54
Change-Id: I66d853391f29acfb026d3c246adba9bdf6a4dc36 Reviewed-on: https://code.wireshark.org/review/8400 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-11When piping tshark to something else, run it with run_and_catch_crashes.Guy Harris2-14/+14
That got the crash information in the WPA EAPOL Rekey test; use it for all other tests where, otherwise, the crash information would be lost. Change-Id: I230b7952b6d79ebf6dc003747dc05328616ef7c2 Reviewed-on: https://code.wireshark.org/review/8394 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-10Fix pathname used to run run_and_catch_crashes.Guy Harris1-1/+1
Change-Id: Ib8bbee1906c89decd16f3ea0ea5f78c9337e5f43 Reviewed-on: https://code.wireshark.org/review/8393 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-10Try wrapping some tshark invocations in a script to catch crashes.Guy Harris2-1/+21
Add a script that takes a command as an argument and runs it in a subshell, so that said subshell will catch any signals from it and report it. This would be done for commands that aren't the last command in the pipeline, as, given that the exit status of a pipeline is the exit status of the last command in the pipeline, there's no guarantee that the shell will bother to pick up the exit status of earlier commands in the pipeline. Use that for the tshark in the WPA EAPOL Rekey test, so it at least can report the signal (on Solaris, SIGSEGV means, among other things, "dereferenced a pointer pointing out of the address space" and SIGBUS means, among other things, "dereferenced a misaligned pointer on SPARC"). Maybe we can make the script also fire up a debugger if it finds a core dump (and a debugger) and get a stack trace. Change-Id: I4188190a1f1a4d3afc4719d886161ee56bd89d8b Reviewed-on: https://code.wireshark.org/review/8392 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-08IEEE 802.11: 802.1X (WPA-EAP) rekeying supportdeagol3-1/+21
This patch extends the existing decryption support for WPA to also handle rekeys by checking each decrypted packet for a 4-way-handshake. Rekeys can be used for WPA-PSK, but are more common with WPA-Enterprise (WPA-EAP). For decrypting WPA-EAP secured packets the user must provide all used PMK's of the connection (aka PSK's) as WPA-PSK 32 byte hex values to wireshark via the existing interface. (The capture must have all 4-way-handshakes included also, starting with the first unencrypted one.) Every decrypted unicast packet will habe the used PMK and TK shown in the CCMP/TKIP section below the key index in the GUI. Group packets will display the GTK instead. Additionally this fixes a small issue with group rekey handling, so every packet can be selected in the GUI in random order, removing the need to manually find the correct group keying packets prior to that. It was tested primary with WPA-CCMP, but TKIP is also working. One section in the code touch bluetooth 802.1X support. It should do exactly the same, but will now also examine all decypted packets for rekeys. Ping-Bug: 11172 Change-Id: I19d055581fce6268df888da63485a48326046748 Reviewed-on: https://code.wireshark.org/review/8268 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-30Add ftsanity.py to the unit tests.Gerald Combs1-2/+23
Change-Id: Ib480d8be5f66c70a4213af27acee94016fbf974b Reviewed-on: https://code.wireshark.org/review/7855 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-13Add a test-programs target everywhere.Gerald Combs2-51/+31
Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-12CMake: Update wslua build and test.Gerald Combs2-1/+5
Process wslua/CMakeLists.txt using add_subdirectory instead of include. Generate files in the build directory instead of the source directory. Copy lua scripts to DATAFILE_DIR instead of DATAFILE_DIR/lua. That's where init.lua looks for console.lua. Always set WIRESHARK_RUN_FROM_BUILD_DIRECTORY when testing. We presumably want to test our source files and not files which may or may not be in the system path. When we're running from the build directory look for lua scripts in both the Autotools and CMake build locations. Change-Id: Ic15ab8c58ff1b170d000c9b3e0a329af2ec44b7b Reviewed-on: https://code.wireshark.org/review/7590 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-12Fix the Lua FPM dissector test.Gerald Combs1-4/+15
In the FPM dissector test, only check the fields produced by the frame and FPM dissectors. Change-Id: I212afb8a8a4a7a9aa54391b0d5971b982b819395 Reviewed-on: https://code.wireshark.org/review/7643 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs2-5/+5
Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-01"Break" the Acme reader so that the tests work.Guy Harris1-0/+7
We don't want to have to change the pcap-ng file against which we compare, so we hardcode the year here to be the same as the year from the pcap-ng capture. Change-Id: Ibd83d06e035341f617b8285f6ba51c749c38a177 Reviewed-on: https://code.wireshark.org/review/7448 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-27Lua: Expose tcp_dissect_pdus() to LuaHadriel Kaplan3-5/+487
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() to make TCP-based dissection easier. Bug: 9851 Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 Reviewed-on: https://code.wireshark.org/review/6778 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-23Test suite: Add verbosity to the HTTP2 test.Gerald Combs1-11/+22
We should probably do the same for the other decryption tests but we're having issues with HTTP2 right now. Change-Id: I8e8f5da200a29a5ca1cddb39c082bb7ee12d1eaf Reviewed-on: https://code.wireshark.org/review/6686 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-23Fix test script to test Lua Pinfo, and fix problem it found.Guy Harris2-3/+1
The test script was running lua/nstime.lua rather than lua/pinfo.lua for the Pinfo test, and the Pinfo test was testing the ipproto property for a Pinfo, but that was removed. Change-Id: Iccdccd265dd550e41640af3acd607362f1f2f02e Reviewed-on: https://code.wireshark.org/review/6747 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-20HTTP2: Add HPACK decode to test suiteAlexis La Goutte2-0/+16
Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142 Reviewed-on: https://code.wireshark.org/review/6415 Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-12Fix Cygwin pathGraham Bloice1-1/+1
Fix the Cygwin path added for tests so that Cygwin comes after the existing path and that the correct link command is found for exntest. Same change to runa2x.sh to be consistent. Change-Id: I177a5e7d17a0077b0e8ca7d264d7e725a5312e24 Reviewed-on: https://code.wireshark.org/review/6503 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-12Make running the tests a little easier on WindowsGraham Bloice1-3/+8
1. Set the igncr option a little differently, this is the preferred way according to the latest Cygwin bash update announcement (See https://sourceware.org/ml/cygwin-announce/2014-10/msg00015.html, Sect 4a) The previous way didn't work for me. 2. Ensure /usr/bin is on the path if running under Cygwin. I really don't want Cygwin on my normal paths, the build process adds if required, so this change makes the test scripts do the same. Change-Id: I0f4da1fa87802bf0a4039bb5a91e577fae506d79 Reviewed-on: https://code.wireshark.org/review/6243 Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-02Fix lua tests on WindowsGraham Bloice2-1/+2
Convert TEST_DIR path to a Windows path, this is used in all the lua tests. Fix a typo Change-Id: I38808822c998ed1df007732b3701b6b13d6c886b Reviewed-on: https://code.wireshark.org/review/6235 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-02test: improve check for out-of-tree testsEvan Huus1-4/+5
Rather than running `cd` and letting it potentially fail, just use the `-d` flag to test that `run` exists and is a directory. Avoids useless stderr output. Change-Id: Iab8b63681db6256aa1a6fc389d2536acbd491aba Reviewed-on: https://code.wireshark.org/review/6239 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02test: default WS_QT_BIN_PATH to WS_BIN_PATHEvan Huus1-1/+1
it used to be SOURCE_DIR, which is still the fallback for WS_BIN_PATH, but this way if you specify a custom WS_BIN_PATH it gets picked up for both Change-Id: If9198565fc7b7b3911550fd200adb0f918622540 Reviewed-on: https://code.wireshark.org/review/6238 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-02Make it easier to run tests out of tree.Joerg Mayer1-3/+8
Change-Id: I4ed10339d3c543d9d199e5262b6e7bb8247544ac Reviewed-on: https://code.wireshark.org/review/5148 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02Lua: regex test suite fails with UTF-8 localeHadriel Kaplan1-1/+7
Due to the change in change-id Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b, the setlocale() call has been moved earlier in tshark's processing, such that Lua plugins load with the environment locale instead of C-locale. Since that matches Wireshark's behavior, it's good, but it causes the Lua regex test suite to fail. So the test suite needs to be fixed. Bug: 10824 Change-Id: I3dcad15a9e247a1e42d2f708ccfb7272de2fe960 Reviewed-on: https://code.wireshark.org/review/6226 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-12-31Test suite: Make sure we have a usable locale before we run iconv.Gerald Combs1-0/+5
Change-Id: Ib1f3143dc48af4c556b9bcdfafbb477fd59b6359 Reviewed-on: https://code.wireshark.org/review/6181 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-31Lua: allow a Dissector object to be passed in for register_heuristicHadriel Kaplan3-2/+63
Bug: 10695 Change-Id: I81181b2d00fcb5f0c25ab89bbe4968897f47a3a6 Reviewed-on: https://code.wireshark.org/review/6131 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-30Test suite: Start testing our output for valid UTF-8.Gerald Combs2-0/+22
Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a couple of the Bluetooth dissectors and X11 keysyms accordingly. Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd Reviewed-on: https://code.wireshark.org/review/6146 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-25Bug 10233 - Wireshark crashes if Lua heuristic dissector returns trueHadriel Kaplan1-28/+155
Because call_heur_dissector_direct() didn't set the pinfo->heur_list_name before calling the heuristic dissector, heur_dissect_lua() would invoke report_failure(). Unfortunately, calling report_failure() within a dissector can cause problems because GTK continues invoking timed callbacks while it displays the modal dialog created by report_failure()... without yet returning from report_failure(). In such a case, it's possible for epan_dissect_run() to be called while still within the execution of a previous call to epan_dissect_run(), which casues an assert since epan_dissect_run() is not reentrant. So this commit both fixes the call_heur_dissector_direct() bug as well as avoids using report_failure() within heur_dissect_lua(). It also upadtes the dissector.lua script used in the testsuite to match the one pubshied on the wiki, since that script's heuristic dissector triggered the bug. Bug: 10233 Change-Id: If022604347745fadac01c02d370ca1a5d3f88b5b Reviewed-on: https://code.wireshark.org/review/6040 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 11:09:29 +0000