aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-11-02RTPS: added new encoding to proto.c and used it in the rtps dissectorJuanjo Martin3-6/+57
RTPS uses NTP encoding with a BASETIME equal to 0. Also, changed "magic" by "Magic" Change-Id: I2512176f2018396edaa6b2a1478facd26118cb13 Reviewed-on: https://code.wireshark.org/review/11184 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-11-02Update some WSUG screenshots and markup.Gerald Combs15-71/+188
Updated the main window and main menu screenshots. Update the markup for the File and Edit menus. Change-Id: I31282e3913692895a35e749c54c77c8069c7167a Reviewed-on: https://code.wireshark.org/review/11487 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-01udp_dissect_pdus follow-upMichael Mann5-51/+153
Add heuristic support Better documentation Change-Id: I236c1f4d3613aa58d608aee0e5edc40c3b158d25 Reviewed-on: https://code.wireshark.org/review/10120 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-11-01[bitcoin] don't THROW() an exception from a dissectorMartin Kaiser1-10/+20
Change-Id: Ibdc7fec48cef53041c1791fb4f6decb0a4df0c89 Reviewed-on: https://code.wireshark.org/review/11458 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-11-01[bitcoin] Convert commands into a dissector tableMartin Kaiser1-145/+143
Change-Id: I30095150ea639d773b887f191e0028c765beba12 Reviewed-on: https://code.wireshark.org/review/11457 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-11-01[iso7816] remove unnecessary initial valuesMartin Kaiser1-4/+4
Change-Id: Ibc370cf99b1f62745174709a35155aa25bc1b3b2 Reviewed-on: https://code.wireshark.org/review/11481 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-11-01Disable RTP player debug logs that were presumably left activated by mistakePascal Quantin1-1/+1
Change-Id: Ieeca052bba14735447cdd6e53de8ed7cda69a27f Reviewed-on: https://code.wireshark.org/review/11480 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-01[Automatic update for 2015-11-01]Gerald Combs16-5847/+6501
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I2ed2f09a178a8c4a455d0ad8be90cf79d235e621 Reviewed-on: https://code.wireshark.org/review/11477 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-11-01packet-dcerpc: improve dissection of bind time feature negotiationStefan Metzmacher1-30/+40
Change-Id: I6bcc5538149e36eed31933897a95fa7592baa84a Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/11363 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-11-01TDS: Register each login param in a separate fieldNathan Cole1-6/+73
Addition of several fields to cover all login parameters. Bug: 11661 Change-Id: I1cb1620b0e1a8c40b311f4dd4b6eb91e6e55a74d Reviewed-on: https://code.wireshark.org/review/11455 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-11-01Add GUID dissector table support.Michael Mann2-2/+176
It seems like DCE/RPC could benefit from a GUID dissector table, where a dissector can register it's GUID with a dissector handle. So here is a basic start. Change-Id: Id407117687a1a648d87f6f99c2ecbf858d8c0911 Reviewed-on: https://code.wireshark.org/review/4718 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01tools/pidl: avoid trailing tabsStefan Metzmacher1-1/+4
Change-Id: I293dd6f2d7ff3b0e27bc3cc49e69977604f12260 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/11433 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-01ISIS Hello: Restore correct dissection of SPB BVIDJim Young1-1/+1
Commit 301a5b7ceac60d0569ce1717e839241d1072400 introduced a small regression with the dissection of the BVID. BVID should be extracted from the 12 most significant bits not the 12 least significant bits. Make it so. Change-Id: Idcf0492eea1f6cb7282641ae243aa7092e5a1418 Reviewed-on: https://code.wireshark.org/review/11472 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-01Qt: do not draw sequence analysis items with a display status set to falsePascal Quantin1-8/+10
Change-Id: Ieff9d6838fcf5329c16df8b7d6367a4c6c3a5ee5 Reviewed-on: https://code.wireshark.org/review/11467 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-11-01VoIP Calls: fix SIP calls statePascal Quantin1-2/+0
A request other than INVITE (like ACK for example) is not a call setup Change-Id: I2e78ed0163822a278b82e250e78aa91e673404cf Reviewed-on: https://code.wireshark.org/review/11466 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-01voip_calls.c: add missing tap_draw callback to taps asking for a redrawPascal Quantin1-22/+200
Otherwise the GUI does not get populated properly Change-Id: I5e24ac5ab2909f3200c588405dbdc9c6bbb82a73 Reviewed-on: https://code.wireshark.org/review/11465 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-01bluetooth: Fix uninitialized value warningJoão Valverde1-3/+2
Change-Id: Iee1d1cf3e24dacca3c1a353001a8af71e074a96b Reviewed-on: https://code.wireshark.org/review/11454 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-01TCP: replace some dissector asserts by a returnPascal Quantin1-4/+6
It prevents an assert in case of malformed packet Bug: 11662 Change-Id: If5d7196c7e6ecd0ffe8ed97213dbd64bc1f69cbb Reviewed-on: https://code.wireshark.org/review/11464 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-10-31[ssh] don't THROW() an exception from a dissectorMartin Kaiser1-2/+5
Change-Id: Ibdbdcf59d7d7d28a812e31c7d7b2123b035f80fa Reviewed-on: https://code.wireshark.org/review/11461 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31[ssh] remove some unnecessary if(tree) checksMartin Kaiser1-20/+8
Change-Id: Id335830e70a944dd5c26e66d7515d168725acf3f Reviewed-on: https://code.wireshark.org/review/11460 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31[lmp] don't THROW() an exception from a dissectorMartin Kaiser1-2/+7
do the bounds check for obj_length before we use it Change-Id: I9e15fae6de05c5833c6959239fcdc0a7d2ca59cb Reviewed-on: https://code.wireshark.org/review/11459 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31[bitcoin] remove two unnecessary return; statementsMartin Kaiser1-2/+0
Change-Id: I97e9ac50b096c798c255227df5760523f623d4bd Reviewed-on: https://code.wireshark.org/review/11456 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-10-31packet-dcerpc: add dissect_ndr_ucarray_block()Stefan Metzmacher2-5/+40
Change-Id: Ibfb49738ea35d1d02220d69187a6083d5ebbae25 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/11365 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-10-30packet-dcerpc: pass dcerpc_info to dcerpc_dissect_fnct_blk_tStefan Metzmacher2-2/+3
Change-Id: I92711ee39850f6710eaebf5c678496e7cd9b5f59 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/11364 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-10-30Add some "protocol placeholders" to remove confusion with Decode As.Michael Mann3-13/+24
Change-Id: Icc4bf0149af81c35bc6b615add473168600468fb Reviewed-on: https://code.wireshark.org/review/11429 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-10-30Remove build-qt-sdk.bat.Gerald Combs2-95/+0
The buildbots have been using pre-built packages from The Qt Company for a while now and it's unlikely we'll have to compile our own in the future. Change-Id: Iee93ab05af46f40585256f991b176392f018727a Reviewed-on: https://code.wireshark.org/review/11449 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-30Explain why Get-HardenFlags currently fails.Gerald Combs1-0/+15
Change-Id: I4a956b2479a482a9262e6e67f6c7611fad9dde84 Reviewed-on: https://code.wireshark.org/review/11448 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-30Add a comment giving details on the Centrino stuff.Guy Harris1-1/+29
Change-Id: Ie65c106f62c8d783c1c53d7a9c3f213f49ae0c1b Reviewed-on: https://code.wireshark.org/review/11445 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-30STUN: register a new conversation dissector after receiving a ConnectionBind ↵Pascal Quantin11-19/+45
Success Response message According to RFC 6062, once the connection is established, data is sent as-is To stop the STUN dissector from interfering, add the ability to specify a starting frame for a conversation dissector and use it Bug: 11641 Change-Id: I65ca96bddacf70444009c0642ea22173fa68992e Reviewed-on: https://code.wireshark.org/review/11372 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-10-30The item argument is used.Guy Harris1-1/+1
Change-Id: I066c8364bcd12d78b41c336b42f235bdfe112515 Reviewed-on: https://code.wireshark.org/review/11441 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-30GTPv2: Mark a parameter unused.Gerald Combs1-1/+1
Change-Id: I0dde941a1d1c9b776363d61cc3e849189b2ea0e7 Reviewed-on: https://code.wireshark.org/review/11439 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-30NLM: fix double memory free when using "Match MSG/RES packets for async NLM" ↵Pascal Quantin1-12/+9
option Change-Id: Ie4f5f8e1ccf9d7b6c7fbee6126697c65f2cc17df Reviewed-on: https://code.wireshark.org/review/11431 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-10-30[GTPv2] Dissect Load Control Information IEAndersBroman1-6/+21
Bug: 11655 Change-Id: I9d50d53ce6b98d7a3e06e90450607f6d5b6be1bc Reviewed-on: https://code.wireshark.org/review/11430 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-30RPC: fix crash when calling NLMv4 SRT statisticsPascal Quantin1-6/+16
packet scope is not valid when called from GUI. To keep API constant, introduce a rpc_proc_name_internal() function allowing to define the memory scope used for string allocation. Bug: 11654 Change-Id: Iff36c090650939c9f2bebfd9c3fd25c51fd97dc0 Reviewed-on: https://code.wireshark.org/review/11425 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30packet-smb2: Add dissector for SMB2_FSCTL_OFFLOAD_READMichael Adam1-0/+85
Change-Id: I0bbbe3f92cf88c3d3d051ad613e237411b828e43 Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/11360 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: Michael Mann <mmann78@netscape.net>
2015-10-30openSAFETY: Remove need for SIII dissector registerRoland Knall1-16/+9
Remove the need for the registration of a dedicated SIII dissector, as this might interfere with "Decode As" handling, as well as being redundant and no longer needed. The udpdata dissector can handle both and gate to the correct sub-dissector if necessary. Change-Id: I756cd845e7e8d64848d9928ad9ff04d571434835 Reviewed-on: https://code.wireshark.org/review/11421 Reviewed-by: Roland Knall <rknall@gmail.com> 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: Michael Mann <mmann78@netscape.net>
2015-10-30couchbase: implement comand 0x48 to get vbucket seqnosSergey Avseyev1-1/+74
Also add missing extras definition for DCP buffer acknowledgement Change-Id: I29cd1e4751b92f119627e42329b2dcfdd7c378df Reviewed-on: https://code.wireshark.org/review/11419 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-10-30[OpenFlow] Use correct name for flag OFPMPF_REPLY_MORE.Pavlos Antoniou1-2/+3
Change-Id: Id190d1a1e24df0c79026bb8dbf62ccd154c1e90d Reviewed-on: https://code.wireshark.org/review/11399 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-10-30DCERPC: Regenerate PIDL dissectorAlexis La Goutte4-4/+4
Fix some not updated link to wiki... Change-Id: Iafaa743c4adda36e6dffe2ec2a3a25b8228b9778 Reviewed-on: https://code.wireshark.org/review/11424 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-30Add a few new negative dfilter tests.Jeff Morriss1-2/+17
For example, to ensure that "field = value" is not a valid dfilter (as was recently a problem). As suggested by Alexis. Change-Id: Ibf498c30325579e3d5474bb2d397f1bbb9ffc07f Reviewed-on: https://code.wireshark.org/review/11339 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-29CMake: Fix compatibility with CMake 3Ryan Doyle1-1/+1
The version of CMake I use (3.2.2) failed to parse the CMakeLists.txt Change-Id: I146c5a5ba8cd6fa6236b53039a31cc085bf5b460 Reviewed-on: https://code.wireshark.org/review/11392 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-29Update the taskbar icon when we start a capture.Gerald Combs2-0/+6
Call both QMainWindow::setWindowIcon and QGuiApplication::setWindowIcon when we switch between normal and capture icons. The former sets the window title bar icon and the latter (depending on your OS and Qt version) sets the taskbar or dock icon. Change-Id: Ida523d423bef4df44696f6cd75208986c8787d0f Reviewed-on: https://code.wireshark.org/review/11414 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-29Qt: Allow Expert Information retapping.Gerald Combs2-21/+39
The Expert Information dialog is open-ended. It adds a tap listener but doesn't remove it, which is useful during live captures. Make sure we add our second-level tree items each time taps are drawn and when tapping is finished. Change-Id: Ie06d60512644e540172f1b330b631db4e4e86897 Bug: 11644 Reviewed-on: https://code.wireshark.org/review/11407 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-10-29Qt: Add the ability to add filter expressions.Gerald Combs13-17/+399
Add a "+" icon to the display filter toolbar which allows the addition of a new filter expression button. (Hopefully this will be the last main window UI change before 2.0.) Change-Id: I52bf56bf699dddb7b387b9f4de1bf8b35eb3c4ce Reviewed-on: https://code.wireshark.org/review/11375 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-10-29Fix typoes.Guy Harris1-2/+2
Change-Id: Icb0f25dbe7a7f9b6b863831a8610e7e1f82fd983 Reviewed-on: https://code.wireshark.org/review/11412 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-29ssl-utils: add versions to ssl debug logPeter Wu4-24/+23
Add Wireshark/GnuTLS/Libgcrypt versions to the debug log file. Remove ssl_lib_init since it didn't do anything useful (the debug file was not open yet so it would write... nothing). Match more (EC)DH(E) cipher suites and try to improve the message. Add the human-readable name besides numeric cipher suite IDs. Change-Id: I84a33d270f91e90efc55371475b231b483fd24c9 Reviewed-on: https://code.wireshark.org/review/11403 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-29It's "GTP Prime" ("GTP'"), not "GTP Prim".Guy Harris1-10/+10
Change-Id: I3b9e321483f21848f884bd301689c43fd625e747 Reviewed-on: https://code.wireshark.org/review/11410 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-29Distinguish mDNS from Boring Old DNS.Guy Harris1-3/+3
Oh, and the "S" in "DNS" stands for "System", not "Service"; see RFC 1034 and 1035. Change-Id: Iff1904dbe245db68880b3336d744460f21fb8fd8 Reviewed-on: https://code.wireshark.org/review/11408 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-29epl: Put OD information into own subtreeChristoph Schlosser1-5/+15
Instead of displaying a long list of OD index, subindex and padding, group the information by parameters. Change-Id: I03ea83f187b4bd4956361d33be674ec62e35bea1 Reviewed-on: https://code.wireshark.org/review/11398 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Christoph Schlosser <christoph.schlosser@yahoo.de> 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: Michael Mann <mmann78@netscape.net>
2015-10-29[SMB2] Fix compile error.Michael Mann1-1/+2
At least MSVC2010 doesn't like individual initialization of structure members by name. It did pass Patri-Dish. Change-Id: I8770a465faf455e2733c7c8015b449871f2acfb0 Reviewed-on: https://code.wireshark.org/review/11406 Reviewed-by: Michael Mann <mmann78@netscape.net>