aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-07-25Fix ptvcursor_add() so it can dissect the last bytes in a TVB again.Jeff Morriss1-1/+1
ptvc->offset has already been incremented by the item length so don't use it as the offset to test_length(); we need to use the original offset. Problem introduced by Idfd258c734e7a946300b2564bebf6e4cb374c8d1 . Change-Id: I0421539bde6e8eb7b5aa3e22dbb0ca8098e88d6f Reviewed-on: https://code.wireshark.org/review/9779 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-25MSWSP: Initial implementation of MS-WSP (windows search protocol) dissectorGregor Beck9-36/+8256
This changeset is a forward port of Gregors ms-wsp branch from his repo http://repo.or.cz/w/wireshark-wip.git. Most of the messages of the MS-WSP protocol are implemented here and as such consists of the majority of the changes for the dissector. In addition to the forward porting Gregors work I added some extra bits 1) cater for SMB2 Read Response and Write Request msgs that can also contain MSWSP messages 2) update property specifications with info extracted from MS-WSP protocol doc 3) store some basic data about previously seen messages that are needed for dissecting CPMGetRows request 4) expand/update dissect_CPMSetBindings & parse_CTableColumn routines 5) parse and store CTableColumn & CPMSetBindingsIn structures in conversation related data for use later. 6) fully dissect/parse SeekDesciption of CPMGetRowsOut 7) dissect CPMGetRows out message specifically the Rows & Columns 8) flesh out the boolean properties of uBooleanOptions field 9) flesh out various other dissectors: CPMRatioFinished CPMRestartPosition CPMCompareBmkIn/CPMCompareBmkOut CPMGetApproximatePosition CPMGetSendNotifyOut FindIndicesIn/Out FetchValue Bug: 11321 Change-Id: I68b5c2f3e63874c1dbb271feab89b2b8aa65ac39 Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-on: https://code.wireshark.org/review/9440 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-24MAC LTE: fix dump of last SDUPascal Quantin1-2/+2
Change-Id: Ice39b71fab564cde0688c451bdf46c7e426475ce Reviewed-on: https://code.wireshark.org/review/9782 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-24Try deleting WiresharkDialog when we close it.Gerald Combs4-11/+19
QDialog::accept and ::reject hide the dialog but don't delete it. In the case of WiresharkDialog and its subclasses we might leak memory or leave files open. Call deleteLater when we close the dialog. Change-Id: Ie0b848a7deeeee4667925b0d886e498f13a86bfc Reviewed-on: https://code.wireshark.org/review/9781 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-07-24MAC LTE: fix dissection when only header is captured but full PDU length is ↵Pascal Quantin1-5/+22
reported Change-Id: I66ccfc26b3a0e948fdcf8dfe4ec8e87e6ed756da Reviewed-on: https://code.wireshark.org/review/9778 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-24RLC: fix dissection when only header is captured but full PDU length is reportedPascal Quantin1-2/+2
Change-Id: I06e7bed71a42c6cbe500d7f1994a625b37d6586c Reviewed-on: https://code.wireshark.org/review/9777 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-24RLC LTE: fix dissection when only header is captured but full PDU length is ↵Pascal Quantin1-2/+2
reported Change-Id: I67654bb0ca30d9bb56c9a4b3be179161ecd0de3a Reviewed-on: https://code.wireshark.org/review/9776 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-24PDCP LTE: fix dissection when only header is captured but full PDU length is ↵Pascal Quantin1-2/+2
reported Change-Id: I62c89a49f3cf2ed566e16a978b2ed237f09d466e Reviewed-on: https://code.wireshark.org/review/9775 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-24SIP: heuristic dissectors should use the captured length, not the reported onePascal Quantin1-2/+2
Otherwise it triggers a "packet size limited during capture" exception preventing following heuristic dissectors to be called Change-Id: Ifc97e84b4e40a1c7dc0b0c63b7b9e015bd99d178 Reviewed-on: https://code.wireshark.org/review/9774 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-241.99.8 → 1.99.9.Gerald Combs10-14/+14
Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-24Build 1.99.8.Gerald Combs4-2137/+6144
Change-Id: I30b5797579335e414295be3996878a30aaef7d6b Reviewed-on: https://code.wireshark.org/review/9772 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-24Fix CMake 7zip searchGraham Bloice1-2/+6
A further fix for the CMake Windows search for 7-zip. Add the destination\bin path to the search path. When downloading from anonsvn only pass the path within the destination not the whole path. Change-Id: I2beec925730fae21d6a63bee5332e1002f49d6ae Reviewed-on: https://code.wireshark.org/review/9770 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-24Skip large files when fuzzing with valgrindEvan Huus1-0/+5
They run the buildbot out of memory, so just skip them, we don't want to remove them from the menagerie entirely. ("large" here is > 20000 KB, but that could change) Change-Id: I58dd9a981be6e6fc661ea624cc0c5258a5986a9f Ping-Bug: 11395 Reviewed-on: https://code.wireshark.org/review/9768 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-24Fix the Copy menu placement in the ProtoTree context menu.Gerald Combs1-2/+2
Change-Id: I8e967000b769918af2c0fb3dae22b3d36be07647 Reviewed-on: https://code.wireshark.org/review/9765 Reviewed-by: Gerald Combs <gerald@wireshark.org>
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-24Lua: fix "since 1.99.9" to be 1.99.8Hadriel Kaplan4-19/+19
Change-Id: I842e4b6a38fc161ba7ab14caa27b3bbf74c989d7 Reviewed-on: https://code.wireshark.org/review/9763 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-23Fix 7-zip searchGraham Bloice1-1/+2
The path for a Chocolatey 7zip.commandline install is $env:ChocolateyInstall\bin and the version installed by Chocolatey for its own use is in $env:ChocolateyInstall\tools Change-Id: I2f1ee78e93f861075f8c06ed74d81d8173911299 Reviewed-on: https://code.wireshark.org/review/9762 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-07-23Fix QCocoaMenu errors.Gerald Combs2-37/+32
In PacketList and ProtoTree, create our own QMenus instead of stealing actions from the main window. This only fixes the errors listed in bug 10890. Add "to do" items for other bugs. Bug: 10890 Change-Id: I1c7ce8e4b863de95b2836e0cdcfb25824fe21edd Reviewed-on: https://code.wireshark.org/review/9760 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-07-23Update the release notes.Gerald Combs1-0/+6
Change-Id: Ia34b10e45debd2e18cf87b6c8bac871cad4b4df6 Reviewed-on: https://code.wireshark.org/review/9759 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-23Fixup selected packet arithmetic.Gerald Combs1-1/+3
Or, "I can mathing" if you prefer meme-based commit messages. Change-Id: I8fd1db0e2a1e99525191ae6b33115ef8e38ab2f4 Reviewed-on: https://code.wireshark.org/review/9758 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-23Add support for MB2c Diameter interface.Umberto Corponi2-1/+387
Add decoding for MB2c specific AVPs according to 3GPP TS 29.468 Rel 12.1.0. Change-Id: I0b50cacb5a3e7cb32de89b31da24e725361edf80 Reviewed-on: https://code.wireshark.org/review/9756 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-23openSAFETY: Disable heur dissector & scm bugfixRoland Knall1-72/+63
- Bugfix for the SCM UDID, where the expert info was generated even if not necessary, and a SCM UDID consisting of zeroes was considered to be valid - Using the new method for enabling/disabling heuristic dissectors, this patch reworks the SIII dissection to perform exactly the same as the EPL dissection (which is the expected behavior) Change-Id: Ide559c3e104b77818cef642b34e0076a7c5bd13d Reviewed-on: https://code.wireshark.org/review/9735 Reviewed-by: Roland Knall <rknall@gmail.com> 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: Anders Broman <a.broman58@gmail.com>
2015-07-23epl: Fix epl write multiple parameter by indexChristoph Schlosser1-15/+52
Instead of interpreting the OD Index and OD Subindex as abort code now the correct offset is applied and the abort code is correctly evaluated. Change-Id: Ic70e755d835c5f62f6cff8a8848a33ee8758faf4 Reviewed-on: https://code.wireshark.org/review/9736 Reviewed-by: Christoph Schlosser <christoph.schlosser@yahoo.de> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-23CheckAPI: Add a shadow variable checkAlexis La Goutte1-0/+30
Check if there is index, time or strlen variable Change-Id: I530a35d6e1cf13f0795b35579ce76ee373ed4b1a Reviewed-on: https://code.wireshark.org/review/8724 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-23NTP: fix DISSECTOR_ASSERT when decoding v6_flagsAlexis La Goutte1-2/+2
Issue include in g8d6324f75 Change-Id: I49267b90a4a196409df76cb369d2dfacf42ba8d3 Ping-Bug:11361 Reviewed-on: https://code.wireshark.org/review/9754 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: Anders Broman <a.broman58@gmail.com>
2015-07-23Add decoding of following GSM A RR messages:Jean Thomas1-3/+63
- Talker indication - Uplink release - VGCS uplink grant Change-Id: I969ada857b71fb3d89efc44a18159c8aa39eef54 Reviewed-on: https://code.wireshark.org/review/9753 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-23Add test_length to ptvcursor_add so it can do some bounds checking.Michael Mann1-24/+27
Ping-Bug: 11358 Change-Id: Idfd258c734e7a946300b2564bebf6e4cb374c8d1 Reviewed-on: https://code.wireshark.org/review/9655 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: Anders Broman <a.broman58@gmail.com>
2015-07-23Lua: add plugin version infoHadriel Kaplan3-6/+101
Expose a "set_plugin_info" global function to set the Lua plugin's version information. Also, put info about Lua scripts loaded from the command-line into the help output, not just for scripts loaded from plugin direvtories. Bug: 11315 Change-Id: I8bc425ed1ed0dfdc1d05178754f44d44e0b209b5 Reviewed-on: https://code.wireshark.org/review/9593 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-23Add Enabled Protocols dialog for QtMichael Mann13-1/+619
This dialog combines the "protocols" and heuristic dissectors (from GTK) into a single tree view where heuristic dissectors are children of their protocol. Change-Id: I107656afd079c1d1c8a98161b736e4b4ad84f813 Reviewed-on: https://code.wireshark.org/review/9739 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-23HTTP2: Update to libnghttp2 1.1.2Alexis La Goutte6-32/+63
Update also the documentation after last change Change-Id: Ie93e669b07c7a0c2b8febabe92c8503296b36998 Reviewed-on: https://code.wireshark.org/review/9746 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-23Qt < 5.1 doesn't have devicePixelRatio().Gerald Combs1-2/+4
Change-Id: I490617db6b645c0129c565eb4b6efceeece9d535 Reviewed-on: https://code.wireshark.org/review/9751 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-23qt_ui_utils.h: fix empty paragraph passed to '@return' command [-Wdocumentation]Alexis La Goutte1-1/+0
Try 2... Change-Id: I2809a46a60732cdef26da9e847588dcfe39781ee Reviewed-on: https://code.wireshark.org/review/9590 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-23Show the current selection in the overlay scrollbar.Gerald Combs3-20/+41
Change-Id: Ie92b7ae170938eac71ede751d9067e1d47293092 Reviewed-on: https://code.wireshark.org/review/9750 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-22RTSP: allow RTP heuristic dissection of RTSP interleaved channel dataHadriel Kaplan2-3/+20
Allow the RTP dissector to register a heuristic to dissect RTSP interleaved data content, in case RTSP didn't know what the data is - for example it missed the RTSP message indicating the Transport info was RTP. Change-Id: I7a6ea886e6744d51533aa916974572fff41eb144 Reviewed-on: https://code.wireshark.org/review/9749 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-22WCCP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Dead Store include on g38c05061b Change-Id: Ib29edea664ac6563c0eb9dc21dae168a8cfe6cd6 Reviewed-on: https://code.wireshark.org/review/9748 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-22Update the AUTHORS entry for David Eisner.Gerald Combs1-1/+1
Update David Eisner's email address at his request. Change-Id: I7886c68bd54790176b39613d876465e04d767059 Reviewed-on: https://code.wireshark.org/review/9747 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-22Use pinfo pool and not packet pool for AT_STRINGZ addressesPascal Quantin3-8/+8
Change-Id: I474e6554b352147702eac32d5574f8ab4a1ab84d Reviewed-on: https://code.wireshark.org/review/9745 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-22Add documentation for new enable/disable protocol and heuristic dissector ↵Michael Mann3-0/+26
options. Change-Id: Ia31326105cf559c2196d45369270552fb78da6c7 Reviewed-on: https://code.wireshark.org/review/9692 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: Anders Broman <a.broman58@gmail.com>
2015-07-22Fix retrieval of data link type supported by remote interfaces with ↵Pascal Quantin13-36/+88
authentication Make use of -A parameter when querying data link types supported by a given interface with dumpcap. Ensure to pass the authentication parameters configured for a remote interface when calling capture_get_if_capabilities() Bug: 11366 Change-Id: I4efea615084a82108e4a12a64e8c46817f30a5c6 Reviewed-on: https://code.wireshark.org/review/9690 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-22Ensure to copy the (un)resolved (source|destination) address columns before ↵Pascal Quantin2-35/+35
freeing epan memory Otherwise addresses like AT_STRINGZ using pinfo->pool are using an already freed memory block Bug: 11387 Change-Id: I615d6bf202d57a949e75ba06a39f8d3e464def2f Reviewed-on: https://code.wireshark.org/review/9744 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-22PCLI: Expand protocol supportLuke Mewburn3-43/+160
1. Implement "Decode As" for PCLI payload instead of assuming IP. Currently supported subdissectors are Ethernet and IP. 2. Implement multiple "flavors" of PCLI with different header formats: pcli: 4 byte CCCID pcli8: 8 byte header (including CCCID) pcli12: 4 byte CCCID, 8 byte NTP timestamp pcli20: 4 byte CCCID, 8 byte NTP timestamp, 8 byte case ID All flavors currently using "Decode As" for payload. 3. Optionally append CCCID to protocol item in tree using preference "pcli.summary_in_tree". 4. Obsolete preference "pcli.udp_port". Bug: 9266 Bug: 11220 Change-Id: Ie4bca06665985ef1eb77db767771a5a82357e242 Reviewed-on: https://code.wireshark.org/review/8608 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-21Translation (Qt): fix typoAlexis La Goutte1-1/+1
Duplicate names and also typo about service (=> Services) Found by yfdyh000 via Transifex Change-Id: I011b98a25828b8fc55b395d7ed5677da51a30f43 Reviewed-on: https://code.wireshark.org/review/9741 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-21Add manual name address resolution.Gerald Combs14-22/+474
Make it an editor frame instead of a dialog similar to the column editor and prototocol preference editor. Change-Id: If1a0cdf02dcab0eca98e8d39c94a3c2fe236df5a Reviewed-on: https://code.wireshark.org/review/9743 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-07-21coap: fix decoding of observe extensionHauke Mehrtens1-5/+11
The observe draft changed and now the option value does not contain the lifetime anymore, but the value encodes if a user wants to register or deregister. Change-Id: I3719101c2bed87c956eb24056be40c9a79dafac8 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/9638 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-21Update symbols.Guy Harris1-1/+23
Change-Id: I92fc9ff73278656c717434c23560127c9c59eb06 Reviewed-on: https://code.wireshark.org/review/9742 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-21Do all the work of registering an ONC RPC-based protocol in rpc_init_prog().Guy Harris35-236/+340
Hand it a table of version/procedure table/hf-for-program-number triplets. Change-Id: I2acc03c2da83353165bd422d8537362201c814e2 Reviewed-on: https://code.wireshark.org/review/9740 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-21Be more careful about variable scope and quoting.Gerald Combs1-2/+2
Change-Id: Ica226178cb43b82a87441fe11e8c2093e01db8a5 Reviewed-on: https://code.wireshark.org/review/9738 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-21LTE RRC: fix a typoPascal Quantin2-2/+2
Let's have consistent naming for dissectors Change-Id: I03d14e208692f39a7ae5017bd539f38f14abaa1f Reviewed-on: https://code.wireshark.org/review/9737 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-21MQ: fix dissection of Work Information Header Reserved fieldRobert Beardsworth1-2/+2
Bug: 11384 Change-Id: If8c2010b38f65b8ee8569e2d2eee1554d6fdee9c Reviewed-on: https://code.wireshark.org/review/9724 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-07-21Don't make dummy RPC program entries.Guy Harris1-60/+38
Just hand the payload off to the data dissector. Change-Id: I59a61ec6352ef0b0c51382d68ca23b00010eb723 Reviewed-on: https://code.wireshark.org/review/9733 Reviewed-by: Guy Harris <guy@alum.mit.edu>