aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-02-14wiretap: add cleanup routine.Dario Lombardo27-165/+355
The cleanup routine has been added to exit section of the applications. Those which required a exit restyle have been patched as well. Change-Id: I3a8787f0718ac7fef00dc58176869c7510fda7b1 Reviewed-on: https://code.wireshark.org/review/19949 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-14[Diameter AVPs] Add 3GPP AVP 1664 to 1680 from TS 29.272AndersBroman1-5/+64
Change-Id: Iccc98e4bb6f7923c9ed0720d6fc469f5c3f74d39 Reviewed-on: https://code.wireshark.org/review/20096 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-13Change Qt setup from 5.5.0 to 5.8.0Joerg Mayer1-1/+1
Change-Id: Ic98922a9e3bf784487512c28921eb5c7d9914e53 Reviewed-on: https://code.wireshark.org/review/19962 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-02-13Make Libgcrypt a mandatory dependencyPeter Wu33-631/+90
Removed all guards for HAVE_LIBGCRYPT, change autotools and CMake to error out if it is not available. Update release notes, developer documentation and README with the new status. Clarify relation with GnuTLS in macosx-setup.sh. Install Libgcrypt via brew script. Motivation for this change is that many dissectors depend on Libgcrypt and having it optional increases the maintenance burden (there have been several compile issues in the past due to the optional status). Furthermore, wsutil has crypto code that can be replaced by Libgcrypt. Change-Id: Idf0021b8c4cd5db70b8766f7dcc2a8b3acbf042f Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20030 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-13[ISAKMP] Dissect 3GPP private error and status messages in NOTIFY.AndersBroman3-8/+76
Change-Id: Iaa65c1cf9f358e36e77b4a5cad2543dcbb98072e Reviewed-on: https://code.wireshark.org/review/20090 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-13tools: add suppressions to valgrind.Dario Lombardo1-0/+23
Remove leaks from libgcrypt. Change-Id: I920e504cfcb45c41510f3edc65d2dbeefda5c5a1 Reviewed-on: https://code.wireshark.org/review/20093 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-13Further explanation in comments.Guy Harris1-2/+6
Change-Id: If88220dc39b2a6baeeefc244639992271b7f0464 Reviewed-on: https://code.wireshark.org/review/20086 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-13Fix a comment to reflect (and better explain) reality.Guy Harris1-3/+5
Change-Id: I4d87438046c18419cea775c547c49cd3abb2089e Reviewed-on: https://code.wireshark.org/review/20085 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12Fix compilation without plugins.Jakub Zawadzki2-12/+18
proto.c:667:6: error: ‘dissector_plugins’ undeclared (first use in this function) tap.c:773:20: error: ‘tap_plugins’ undeclared (first use in this function) Change-Id: I8feaec4219dc97202bdb79d72399c5fd1d383e27 Reviewed-on: https://code.wireshark.org/review/20081 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
2017-02-12Set the partial AID in the radio metadata structure.Guy Harris1-0/+2
Change-Id: I2d5a1cd7d264e8df7f4520272d6310e49cf8126d Reviewed-on: https://code.wireshark.org/review/20080 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12sharkd: fix a memory leak on Windows introduced in gfe06aadPascal Quantin1-0/+1
Change-Id: I907dbc924574b02d2f1b8d7668158b5b6d2c87cf Reviewed-on: https://code.wireshark.org/review/20073 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>
2017-02-12tshark removed empty line in -T ek outputMartin Kacer1-1/+0
Change-Id: Id4c1ab258308ecc8421a5c82b6e937a9d35bf58e Reviewed-on: https://code.wireshark.org/review/20061 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-12uat: add missing parameter to documentation.Dario Lombardo1-0/+1
Change-Id: Ic39b00e0800c123083a6583d78eb96154b93e49f Reviewed-on: https://code.wireshark.org/review/20075 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-12[skinny]: Add struct/union guards to multi-part message handlersDiederik de Groot5-1069/+913
Improve multi-part message handling - Calculate (sub) structure/union length - Add a guard when iterating over multi-part message - For fixed length messages, advance the cursor when iteration falls short of max length Change-Id: Id2af3aa1a878328f105e173cabe2b68dd0343507 Reviewed-on: https://code.wireshark.org/review/20057 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-12[skinny] Fix ConnectionStatRes and DialedNumber Messages protocol version >20Diederik de Groot6-328/+341
- ConnectionStatisticsResponse Comes in three different forms - DialedNumber Message has variable length Minor: - Pass ipv4or6 connection address back to calling function (using this later on in seperate commit) - Correct spelling mistakes - Remove duplicates from DeviceType[] Change-Id: Ib1619b163c12b6a4c6c86972186d828be3fd94e2 Reviewed-on: https://code.wireshark.org/review/20056 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-12[Automatic update for 2017-02-12]Gerald Combs13-160/+485
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I84ecfdd35a8f2935f950f72c01a69b70a6a80c07 Reviewed-on: https://code.wireshark.org/review/20070 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-12Put the definitions firstJaap Keuter1-1/+1
To help compilers that don't like mixed definitions, put the definitions first. Bug: 13398 Change-Id: I7f011feef7c7574df7a03cec87693e664be559ca Reviewed-on: https://code.wireshark.org/review/20067 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-12Fill in pseudo-header fields in order, and add the group ID for 11ac.Guy Harris1-11/+13
Change-Id: I0011917b77b1adc0cb6effd5d9d902f541675d78 Reviewed-on: https://code.wireshark.org/review/20066 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12Add a comment about wired-to-little-endian fields.Guy Harris1-0/+8
Other fields in the Prism header are in the same byte order as the magic number; if the host generating those fields is big-endian, are these fields little-endian or big-endian? Change-Id: Ieb857db3ea63a673d9224cb2a7be3ff2bfb5861c Reviewed-on: https://code.wireshark.org/review/20065 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12White space/style cleanup and consistency.Guy Harris1-429/+442
Go with 4-space indentation. Also, get rid of some unnecessary brackets. Change-Id: I07b4f126ba58ef3d013db7741d91484ae32e60d7 Reviewed-on: https://code.wireshark.org/review/20064 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12signal() is defined on some UN*Xes; don't use it as a variable name.Guy Harris1-3/+3
Change-Id: Iec68f35eefdc3ce17112c04477eae99e5aa58eb8 Reviewed-on: https://code.wireshark.org/review/20063 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-12Decode QCA sniffer PRISM extensions, and populate some wlan_radioSimon Barber1-5/+441
fields. Patch received from QCA, and fixed up to build on master and pass some fields on to wlan_radio. Bug: 12978 Change-Id: I65ba7d07fbd76e98bb13399e46b400109387764c Reviewed-on: https://code.wireshark.org/review/17720 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-11tshark print_indent functionMartin Kacer1-39/+26
Modified epan/print.c to use function print_indent Change-Id: Iefcb1e3c7813919c6af70d57a4f8a6f921595360 Reviewed-on: https://code.wireshark.org/review/20060 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-11Fixing the MAC tvb creation in FP's tb dissection methodS. Shapira1-2/+2
Bug: 13392 Change-Id: I387a6715164180487606ba3e9e4aaf64695aa543 Reviewed-on: https://code.wireshark.org/review/20050 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>
2017-02-11TLS13: handle Key Update for decryptionPeter Wu3-5/+71
Generate new key upon receipt of Key Update message. Untested. Note that the "traffic_secret" field in SslDecryptSession was unused and since the client and server have two different encryption states, store the application traffic secret in SslDecoder. Change-Id: Iefca3f6cb75745a996fecb0fe7769c876dc9c4ee Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/20013 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11TLS13: add Key Update dissectionPeter Wu4-2/+43
Actual decryption support will be added later. Ping-Bug: 12779 Change-Id: I3ff1f243fd0bd1467e84d8a6a5433c1fe71bbebf Reviewed-on: https://code.wireshark.org/review/20012 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11ssl-utils: add length validation for Certificate handshake messagePeter Wu4-18/+34
This also introduces a new macro, "G_MAXUINT24" as symbol for 2^24-1 (this name does not exist in GLib and uncommon in Google). Change-Id: If000f41f6286161e3a7697357fc33ae16c1e11db Reviewed-on: https://code.wireshark.org/review/20003 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11TLS13: fix length of Finished messagePeter Wu4-5/+11
Select the full message instead of just the first 12 bytes (as was the case in previous TLS versions. No check is added since it is too much work for little gain (it would require looking up the hash length for the cipher suite). Change-Id: Iea13d5abe6a7e55b04fabacfa8919a02acd8517d Reviewed-on: https://code.wireshark.org/review/20011 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11ssl-utils: add length validation to CertificateRequestPeter Wu1-35/+41
Add length validation to several fields in CertificateRequest. Clarify specification, remove unnecessary length check and add TODO for TLS 1.3. Change-Id: Ic3aca62d90e5fad6930beb371adf10d7b7b9fbe2 Reviewed-on: https://code.wireshark.org/review/20010 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-11TLS13: add length validation for Pre-Shared Key Exchange ModesPeter Wu1-17/+12
Add length validation for expert info and add a reference. Change-Id: Id21916b11ca924b517ea45294798692a010e7541 Reviewed-on: https://code.wireshark.org/review/20009 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-10TLS13: add length validation for Pre-Shared Key ExtensionPeter Wu1-26/+23
Use "ssl_add_vector" for length validation and expert info. Change-Id: Ib38d36dfd82b78580035415d0924f1fae6cbe96d Reviewed-on: https://code.wireshark.org/review/20008 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-10ssl-utils: update supported_groups extensionPeter Wu2-43/+66
Update references, rename the old "elliptic_curves" name to "supported_groups". Fix a wrong field name (EC Point Format now has its own hf). Add length validation for "elliptic_curve_list". Change-Id: I554ebb259ba7561b48dfe1cc9162a0b3b3bcdba4 Reviewed-on: https://code.wireshark.org/review/20007 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-10TLS13: add length validation for SupportedVersionsPeter Wu1-8/+19
Also add reference to specification. Change-Id: I5619ce175711f6768949f8b7eec789320100573c Reviewed-on: https://code.wireshark.org/review/20002 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-10ssl-utils: stylistic changes for ServerHello, HelloRetryRequestPeter Wu3-20/+16
Change "length" to "offset_end" parameter for consistency. Clarify applicable TLS version in comments. Remove unnecessary check for length. Change-Id: Icdc7edff9c8fdaf4c7d7349f65fed42f5344f2c3 Reviewed-on: https://code.wireshark.org/review/20001 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-10diameter_3gpp: added decoding of TWAN-Identifier AVPJan Spevak5-5/+26
Change-Id: Ib3adec4f7abbdd0313e0017f540044ac45a8883a Reviewed-on: https://code.wireshark.org/review/19930 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-10wmem_list: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+0
Clang Change-Id: Ibbbe9fb0165eaa297c2b70bf7e478cf538e2cc33 Reviewed-on: https://code.wireshark.org/review/20040 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10filter_list: add cleanup function and call it on exit.Dario Lombardo7-0/+31
Change-Id: I51d8074cc5a63d4fd3af8852df120d6b4163217f Reviewed-on: https://code.wireshark.org/review/19942 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10Clean columns on exit.Dario Lombardo5-1/+6
Change-Id: I950295c35fc67193d9825ebc741da151ad99e077 Reviewed-on: https://code.wireshark.org/review/19941 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10Convert conversation hash tables to use wmem.Michael Mann8-128/+86
Simplifies cleanup because wmem can handle the memory cleanup. Change-Id: Idc6a9bfe5f23c83b59a5278a64b9fb706862342d Reviewed-on: https://code.wireshark.org/review/20042 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10service_response_time_table (GTK) fix parameter 'data' not found in the ↵Alexis La Goutte1-1/+1
function declaration [-Wdocumentation] Change-Id: I6079399be6a94d3b718b31c6a21076d092adf580 Reviewed-on: https://code.wireshark.org/review/20049 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-10response_time_delay_dialog (Qt): Fix warning: parameter 'user_data/data' not ↵Alexis La Goutte1-3/+4
found in the function declaration [-Wdocumentation] Change-Id: I592b35a3ceec477a8269f5cda0c5c363681a36aa Reviewed-on: https://code.wireshark.org/review/20048 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-10mswsp: Align parse_CAggregSpec function with MS-WSP specification.Noel Power1-27/+70
Fix some errors in the parsing of the CAggregSpec structure, see 2.2.1.24 in the MS-WSP specification. Change-Id: Ib281c10ab897e5c0282aa1b0d304df97a2fd14a3 Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-on: https://code.wireshark.org/review/20036 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10mswsp: Numerous bugfixesNoel Power1-20/+11
1. Fix display of CTableColumn.StatusUsed & CTableColumn.LengthUsed Both StatusUsed and LenghtUsed members were displayed as 2 byte length values instead of single byte values. 2. Fix minor spelling mistake 3. display correct address(s) for array of address values 4. Use correct minimum CTableColumn size This is followup patch for patch already provided for bug 13299. The previous minimum value neglated to take into account the CFullPropSpec structure (which is on the wire) but is represtented as a string in the internal CTableColumn structure. Note: this doesn't make any difference to the effectiveness of the previous patch but should avoid confusion if someone later actually investigates the correct minimum size. 5. Fix CPMCREATEQUERY message parsing Following a query and subsequent clarification from dochelp@microsoft.com the MS-WSP specification document was found to be incorrect. CPMCreateQueryIn | ---> CSortSet should instead eventually point to CSortSet via the following msg structure CPMCreateQueryIn | ---> CInGroupSortAggregSets | ---> CInGroupSortAggregSet | ---> CSortSet Change-Id: I7da6c7db817113f5542f25f078626030ad30d737 Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-on: https://code.wireshark.org/review/20031 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-10Convert conversation data_list from GSList to wmem_tree.Michael Mann2-83/+18
Change-Id: I7eac4b4da86d1ac1ce8753f424b698a9949df00b Reviewed-on: https://code.wireshark.org/review/20041 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09Add wmem_map_get_keys.Michael Mann3-0/+35
Mimic functionality of g_hash_table_get_keys Change-Id: I7702854ed771a5b3bf7ea5295a67c42f0f477cdf Reviewed-on: https://code.wireshark.org/review/20039 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09Add wmem_map_stealMichael Mann3-0/+41
Mimic functionality of g_hash_table_steal Change-Id: Iaf4aeef951b60934569143b2d119f782aeefe380 Reviewed-on: https://code.wireshark.org/review/20038 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09Add wmem_tree_remove32Michael Mann3-0/+20
Change-Id: Ic79fd0a2a13341dd7ba563cf3a056c51e9d16960 Reviewed-on: https://code.wireshark.org/review/20037 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09dof: free more memory on shutdown.Dario Lombardo1-0/+15
Change-Id: Ic4604cc2f999f4e669af00e37dad9b60cb06e599 Reviewed-on: https://code.wireshark.org/review/19977 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-09dissectors: update list of controls in CTDB dissector.Günther Deschner1-20/+184
Note that although some of the controls have been removed from the protocol in upstream CTDB versions they are still present here in order to dissect older protocol variants. Guenther Signed-off-by: Guenther Deschner <gd@samba.org> Change-Id: I67d8f69a7e920f4b1eeed21caab4d2b0b104d669 Reviewed-on: https://code.wireshark.org/review/20023 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-09Add wtap_init to dftest.Michael Mann1-0/+4
Bug: 13387 Change-Id: I7dfae550f814cdc15924357996e2086eea58ecf4 Reviewed-on: https://code.wireshark.org/review/20026 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>