aboutsummaryrefslogtreecommitdiffstats
path: root/test
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-12-24test suite: (Minor) fix some double spaceAlexis La Goutte2-4/+4
Change-Id: I7fe7cd7ed471b8fcd2afd5fb4bbc180b580295b3 Reviewed-on: https://code.wireshark.org/review/6031 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-23test suite: fix indent (use tabs) and add modelinesAlexis La Goutte3-50/+61
Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0 Reviewed-on: https://code.wireshark.org/review/5985 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-01Remove private_data member from packet_info structure.Michael Mann1-2/+0
Dissectors should pass data directly to their subdissectors through the data parameter (of new-style dissectors). This avoids unintentional "trampling" from other dissectors trying to "share" private_data member. Change-Id: I2efef5c8dfeef64588ba3ac6e695b469238c6468 Reviewed-on: https://code.wireshark.org/review/5487 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-08Try to speed up ping-dependent capture tests.Gerald Combs1-9/+14
Ping four times a second for ~60 seconds. Save the subprocess PID so that we can kill it when we're done with each test instead of waiting for it to finish. Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6 Reviewed-on: https://code.wireshark.org/review/4557 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-03Re-enable the Wireshark test suite.Gerald Combs1-1/+1
Change-Id: Icfd9edb8c6ef7620878bc9d60c8dcc569ad2abad Reviewed-on: https://code.wireshark.org/review/4434 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Partially re-enable Wireshark tests.Gerald Combs2-3/+6
Qt requires Xrender and XKEYBOARD. Unfortunately the Ubuntu and Solaris buildbots run the test script under Xtightvnc, which provides neither of those. Only enable the tests on Windows and OS X for now. Change-Id: I84bc28f810782b862b4dca8fc8df088a4919066d Reviewed-on: https://code.wireshark.org/review/4430 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-02Temporarily disable the Qt tests added in g58cde5c.Gerald Combs2-2/+2
Apparently what works for me doesn't work for the Buildbot users. Change-Id: I7d3e4f2b89ae8ae3dadc8d92438c0e1923b97ace Reviewed-on: https://code.wireshark.org/review/4416 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-01Add tests for the Qt UI.Gerald Combs4-4/+43
Make sure the Qt UI quits if WIRESHARK_QUIT_AFTER_CAPTURE is set. Make sure Bourne shell scripts (*.sh) have UNIX/POSIX line endings. Reduce some time values so that the tests run faster. Change-Id: I81df7c6f72d7d807d1856863cbea1bb6326ca711 Reviewed-on: https://code.wireshark.org/review/4407 Tested-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-29Fix lua bindings to handle timestamp precision changesEvan Huus1-1/+1
The recent wiretap changes broke the generation of init.lua among other things, though it did coincidentally fix one of the "yuck" comments in the generator regex. (Note that this is entirely untested, because out-of-tree init.lua is and always has been broken, but it should work) Change-Id: Id0c27b31c596613997de4ba2f6088eb9d6c8fc53 Reviewed-on: https://code.wireshark.org/review/4361 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-24test: add decryption test for isakmp with certificatesAlex Badea3-0/+19
This was suggested in review 2297. Capture and key are from bug 7951. Bug: 7951 Change-Id: I820c5e839b20ec464cc1be438633d5311f657fb2 Signed-off-by: Alex Badea <abadea@ixiacom.com> Reviewed-on: https://code.wireshark.org/review/4143 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs4-8/+8
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-12make unit-test suite work out-of-treeEvan Huus1-5/+15
Change-Id: I638015a9b55712bb6843d6756c9c55915e142372 Reviewed-on: https://code.wireshark.org/review/2893 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-27Tighten the dump-glossary test.Evan Huus1-1/+4
1. The only indication we get of an out-of-order value string is a message on STDERR, so check that and fail the test if STDERR wasn't empty. 2. This exposes an out-of-order value string in packet-stun.c; fix it. 3. This triggered the pre-commit hook on packet-stun.c, which noticed an API error (ENC_ASCII -> ENC_ASCII|ENC_NA); fix that too. Change-Id: I36f87a2a87b40537119562f22a7e3012716ff239 Lesson: automated testing/tooling is both wonderful and scary. Reviewed-on: https://code.wireshark.org/review/2682 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-25Decrease TRAFFIC_CAPTURE_DURATION from 60s to 15s.Gerald Combs1-1/+1
Change-Id: Ie6d6ac0489f0fcb506360a3900d33c44cb3477e9 Reviewed-on: https://code.wireshark.org/review/2664 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-18Check for lua by grepping the output of tshark -vEvan Huus1-2/+2
Grepping config.h doesn't work for out-of-tree builds. Change-Id: If3f551dffb04dd646f5adece57fac90dc48ff1c9 Reviewed-on: https://code.wireshark.org/review/2389 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-24Allow wtap_read() and wtap_seek_read() to return records other than packets.Guy Harris2-2/+5
Add a "record type" field to "struct wtap_pkthdr"; currently, it can be REC_TYPE_PACKET, for a record containing a packet, or REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific data. Modify code that reads packets to be able to handle non-packet records, even if that just means ignoring them. Rename some routines to indicate that they handle more than just packets. We don't yet have any libwiretap code that supplies records other than REC_TYPE_PACKET or that supporting writing records other than REC_TYPE_PACKET, or any code to support plugins for handling REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug 8590. Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813 Reviewed-on: https://code.wireshark.org/review/1773 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-21Fix lua directory tests.Evan Huus1-14/+16
The underlying directory iterator is not guaranteed to return directories in the same order according to the glib documentation, so don't rely on the directory order being the same when testing it. https://developer.gnome.org/glib/2.37/glib-File-Utilities.html#g-dir-read-name Bug:10009 Change-Id: I4b1078e1f3981921b1e83c4f77b4bc30a5d21b46 Reviewed-on: https://code.wireshark.org/review/1671 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-27Revert part of g757db64e484b009c3Evan Huus1-1/+1
It was intended to change the DTLS decryption test, but changed the SSL test file instead, which led to the SSL test mysteriously failing. The SSL capture really is http, so that's the right protocol, and the port is the standard 443, not 4433 (which was perhaps a typo?). Change-Id: I84448c2326d2a4301a4bba9607f8ba90a495531d Reviewed-on: https://code.wireshark.org/review/1401 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-26Have DTLS just dissect the test capture as dataEvan Huus1-1/+1
Follow-up to g757db64e484b009c33b67b5fa38e109d7b8f5e78 which changed the filter being tested but didn't change the target protocol, so the test was still failing because it was still trying to use HTTP. Change-Id: I6675cfad3bba63f7a536eb7ae82e4b25132d108e Reviewed-on: https://code.wireshark.org/review/1375 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-25Don't use HTTP filter for DTLS decryption test as it's not really HTTP ↵Michael Mann2-2/+2
traffic (and a more discerning HTTP dissector will cause this to fail) Change-Id: I74ea78f541f87000d84c85794d04e9de46d477f2 Reviewed-on: https://code.wireshark.org/review/1333 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-17Add tvb_get and proto_tree_add for string-encoded byte arraysHadriel Kaplan2-25/+246
This commit adds tvb_get_string_bytes and proto_tree_add_bytes_item routines for getting GByteArrays fields from the tvb when they are encoded in ASCII hex string form. The proto_tree_add_bytes_item routine is also usable for normal binary encoded byte arrays, and has the advantage of retrieving the array values even if there's no proto tree. It also exposes the routines to Lua, both so that a Lua script can take advantage of this, but also so I can write a testsuite to test the functions. Change-Id: I112a038653df6482a5d0ebe7c95708f207319e20 Reviewed-on: https://code.wireshark.org/review/1158 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>