aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-03Add M2AP dissector (3GPP 36.443 v13.3.0)Pascal Quantin16-0/+6771
Change-Id: I1a5d4390e91c5a758e52feba6059407d873adf7a Reviewed-on: https://code.wireshark.org/review/17472 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>
2016-09-03cmake: fix libnl caching issue, make it more robustPeter Wu1-38/+55
Dario reported that the cmake build fails after installing libnl3-devel (libnl-devel was already present). This results from a name collision for NL_LIBRARY and NL_INCLUDE_DIR variables. Initially these variables contained the values for libnl-1. When libnl3 is installed, these variables were not updated (because it was cached), but HAVE_LIBNL3 would still be set, resulting in a header and feature mismatch. Use separate variables for libnl1 and libnl3 to fix this. Other fixes: also set HAVE_LIBNL for libnl1; fallback to libnl1 if libnl3 is unusable (e.g. because libnl-route-3.0 is missing). Change-Id: Icf0a03843ea870347ddf365f69bacf4883d07f6d Reviewed-on: https://code.wireshark.org/review/17449 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-03SMB2: dissect getinfo request fixed parametersUri Simchoni1-30/+43
Dissect SMB2 getinfo request fix-sized parameters according to [MS-SMB2] section 2.2.37. This does not include extended attributes at the moment. Change-Id: I5281edf0c21517cdf43ef00e89b5680b8174c383 Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-on: https://code.wireshark.org/review/17444 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>
2016-09-03SMB: dissect FILE_GET_QUOTA_INFORMATIONUri Simchoni2-0/+35
Add a function that dissects FILE_GET_QUOTA_INFORMATION structure ([MS-FSCC] 2.4.33.1) This structure is used to define a set of SIDs whose quota is to be fetched. Change-Id: I81f6bca98fb239935ca593bd8725cebbb2037fbe Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-on: https://code.wireshark.org/review/17445 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>
2016-09-02Qt: Conversation time column updates.Gerald Combs12-10/+130
Add a checkbox which lets you toggle between absolute and relative start times. Use the local time for now. Fixes bug 11618. Adjust our time precision based on the capture file's time precision. Fixes bug 12803. Update the User's Guide accordingly. Bug: 11618 Bug: 12803 Change-Id: I0049d6db6e4d0b6967bf35e6d056a61bfb4de10f Reviewed-on: https://code.wireshark.org/review/17448 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-02Note that not all UN*X file systems are case-sensitive.Guy Harris1-1/+8
Expand a comment to suggest what we should probably do on macOS. Change-Id: Ic18afe5d1b165dbb27b5f0f5ff3ff9a33835a0f4 Reviewed-on: https://code.wireshark.org/review/17470 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-02Qt: Preserve capture filter when preferences changedStig Bjørlykke1-1/+5
Avoid that the last entry from recent.capture_filter is added to the capture filter combo when editing preferences or changing profile. This bug was introduced in gb7897dde. Change-Id: I38a32386765c9e7ffaa93d006ff0ef7b78ac8252 Reviewed-on: https://code.wireshark.org/review/17453 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02Qt: Add a timeline indicator to conversations.Gerald Combs10-25/+286
Add a timeline indicator to the Start and Duration columns in the Conversations dialog. Add tooltips to the columns that explain what's going on. Round the timeline rect corners and do the same for Prototocol Hierarchy Statistics. This should hopefully differentiate the graph bars from a text selection and IMHO it looks better. Update the PHS and Conversations images in the User's Guide. Change-Id: I61d6c25843be522cc444e01ba77cb5b1e991fa36 Reviewed-on: https://code.wireshark.org/review/17396 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: Anders Broman <a.broman58@gmail.com>
2016-09-02btavctp: rework the reassemble routine (CID 1355682).Dario Lombardo1-13/+6
The CID is about the lack of check of wmem_tree_lookup32_le() return value, but the old code worths a bit of rework. Change-Id: I3adb868d2baa1c8aea3f914f7fb9fdf75f222960 Reviewed-on: https://code.wireshark.org/review/17322 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02Reworked dissection of BGP Extended Community attributesPeter Palúch1-172/+352
This patch contains a partial rewrite of the BGP dissector for Extended Communities. The changes were primarily motivated by my dissatisfaction with the generally unreadable way in which the types, names and values of BGP Extended Communities were displayed in Wireshark GUI. The rewrite provides a hopefully more readable and eye-pleasing way of displaying the extended communities. I have also corrected numerous other flaws with the Extended Community dissector I stumbled across. In particular, the changes encompass the following: 1.) The Type octet of an Extended Community is now analyzed including its Authority and Transitivity bits. These were not dissected before. 2.) Dissection for EVPN Extended Community was improved. The original implementation blindly assumed that there is just a single subtype and decoded the community ignoring the actual subtype. 3.) I have removed the hf_bgp_ext_com_value_unknown16 and ..._unknown32. The current code uses a different approach to display values of unrecognized communities, and for recognized communities, there are no "unknown" subfields. 4.) Removed a couple of variables declared at the dissect_bgp_update_ext_com() level. These stored the result of a tvb_get_...() call but the value was used only once. I have replaced them with the direct use of tvb_get_...() 5.) Moved duplicate code to add the Type value into the community_tree from each branch in the switch(com_type_high_byte) out of it and placed it before the switch(). 6.) Reworked the style in which individual communities are displayed. Each community item (collapsed) is now displayed using the following label format: Community name: Values [Generic community type] Examples: Route Target: 1:1 [Transitive 2-Octet AS-Specific] Unknown subtype 0x01: 0x8081 0x0000 0x2800 [Non-Transitive Opaque] Unknown type 0x88 subtype 0x00: 0x0000 0x0000 0x0000 [Unknown community] 6.) To keep the filter names more consistent, changed names of selected filters: bgp.ext_com.type_high -> bgp.ext_com.type bgp.ext_com.type_low -> bgp.ext_com.stype_unknown In particular, I do not want to call the subtype as bgp.ext_com.type_low because that filter applied only to unrecognized subtypes even though its name would suggest to users that they can filter any community based on it. 7.) Numerous corrections in text labels, names and labels that have been incorrect or incomplete. Bug: 12794 Change-Id: I9653dbbc8a8f85d0cd2753dd12fd537f0a604cf3 Reviewed-on: https://code.wireshark.org/review/17377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02aruba_erm: register dissector by name.Dario Lombardo1-0/+1
Change-Id: Ifad70ed2ee2a554cdc31496ad47148728071abdb Reviewed-on: https://code.wireshark.org/review/17458 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02Qt: Clear open files list when clear recent menuStig Bjørlykke1-0/+7
Remove all recent files from the main welcome page when clearing recent files from the menu. Change-Id: Ic410a729e63d82ee58b6bbb31f7e4a658b17d794 Reviewed-on: https://code.wireshark.org/review/17456 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-02Qt: Add newly saved files to the recent filesStig Bjørlykke1-0/+3
Update the recent files list when saving unsaved capture files. Change-Id: I469fa1f2ce3216c66de328c0b3558c9f9db115e0 Reviewed-on: https://code.wireshark.org/review/17454 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-02[SIP] Call sub dissectors for Diagnostics in SIP reason texts.AndersBroman2-16/+96
Change-Id: I68cbcf257b63a86ee37e1357876a90ea683a1d5a Reviewed-on: https://code.wireshark.org/review/17455 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>
2016-09-02GTP: continuation of patch for Target Identification, correction of PLMN in ↵Binh Trinh1-7/+10
the case of non-compliance Change-Id: Id848574ea748786ccd6808d370cb480caa948cfb Reviewed-on: https://code.wireshark.org/review/17433 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>
2016-09-02ERF: Fix dissector abort on short meta tags and typosAnthony Coddington1-37/+107
Fix dissector abort on short tags. Fix value typo in hash mode enum. Differentiate unexpectedly short value, zero length (deliberate invalid) and off-end-of-record tags through expertinfo. Continue to use proto_tree_add_*() length mismatch warnings for unxepectedly long tags for now. Change WWN tags to FT_BYTES for now as they are 16 not 8 byte WWN. Not currently implemented outside Wireshark anyway. Ping-Bug: 12303 Change-Id: I79fe4332f0c1f2aed726c69acdbc958eb9e08816 Reviewed-on: https://code.wireshark.org/review/17382 Reviewed-by: Anthony Coddington <anthony.coddington@endace.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>
2016-09-02SMB2: dissect class and infolevel in get quota info requestUri Simchoni1-0/+6
(actually, in [MS-SMB2] those are called "InfoType" and "FileInfoClass", respectively) Change-Id: Id583be4574cea5ce092c374a5624a4bd17d5d4c6 Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-on: https://code.wireshark.org/review/17443 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02SMB2: dissect quota infoUri Simchoni1-0/+30
This info appears in the request buffer of setinfo quota, or in the response buffer of getinfo quota. Change-Id: I5c8d96a05eddfa123547a7dd2577a01ac8cbd32d Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-on: https://code.wireshark.org/review/17442 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>
2016-09-02SMB: make dissect_nt_user_quota publicUri Simchoni2-1/+2
To be usable by SMB2 dissector Change-Id: I7f5b9a021951c2529f8058cd2fc160eff2e865c6 Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-on: https://code.wireshark.org/review/17441 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02smb: parse user quota change timeUri Simchoni1-4/+8
In SMB user quota records, parse unknown 8-byte field as quota record's last change time (source - [MS-FSCC] 2.4.33) Change-Id: I1f2839934fc0ab8e3d38105e02ef91a547256a70 Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-on: https://code.wireshark.org/review/17440 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>
2016-09-02GSM MAP: Add OSM URI for locationEstimateUli Heilmeier1-3/+20
As requested by bug 10969 add a link to OSM for locationEstimate. Bug: 10969 Change-Id: I715b3b5eae9728999d5c8f8c155bbcef3911ee93 Reviewed-on: https://code.wireshark.org/review/17375 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> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-02CMake: Move version declarations to the top of CMakeLists.txt.Gerald Combs1-14/+14
This lets me be more lazy during releases. Change-Id: Ie59e200f1f46282e9271f459c0bbf31dc74a59a7 Reviewed-on: https://code.wireshark.org/review/17450 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: Michael Mann <mmann78@netscape.net>
2016-09-01uat: fix memleak after parsing and on errorsPeter Wu1-7/+32
Memleaks could occur in these scenarios: - Two consecutive fields fail in their chk callback, overwriting the first heap-allocated error message. - After parsing one record, the internal record was never freed. - Syntax errors abort the parsing process and leaks the record and current field value. These leaks will only happen at startup, when the UAT files are read or when UAT strings are loaded (e.g. from the ssl.keys_list preference). Change-Id: I4cf7cbc8131f71493ba70916a8f60168e5d65148 Reviewed-on: https://code.wireshark.org/review/17432 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01E.212: update Chinese PLMN listPascal Quantin1-5/+9
Bug: 12798 Change-Id: Id9569cb0f79094d5152ea5949d398eb7384ee76f Reviewed-on: https://code.wireshark.org/review/17439 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-01uat: clarify documentationPeter Wu4-50/+96
No functional change, fixes typos, adds some meaningful function parameters and tries to clarify the memory management concerns. Also fix a -Wdocumentation issue in epan/proto.h Change-Id: I59d1fcd2ce96178e0a64a0709409a9a7a447c7c6 Reviewed-on: https://code.wireshark.org/review/17431 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01GTP: Added dissection of UTRAN Container for Forward Rel Req/Resp MessagesBinh Trinh1-1/+27
Change-Id: I8330e7e57d3ad09e526da0d7a0970f96fedd03a6 Reviewed-on: https://code.wireshark.org/review/17434 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>
2016-09-01gtk: fix compilation with GTK+ before 2.18Peter Wu31-8/+37
Removed in v1.99.2rc0-399-g43f09e6, but some includes are still needed. Basically I looked for the functions defined in the ui/gtk/old-gtk-compat.h header file that were in files below ui/gtk/. Then I matched it against the removed part in the above commit and added the header back at its old place. In two other cases, the header was only needed for Windows. If the above commit did not reference the file, I checked which function was in use and added the header on top, removing redundant conditionals. Reported and tested by a user of GTK+ 2.12.12 on top of v2.0.5. Change-Id: I649eec1e5531070f88c99d893c4920306f56d849 Reviewed-on: https://code.wireshark.org/review/17371 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01ipv6: fix build with old 32-bit glib headers (master only)Peter Wu1-1/+1
Introduced with v2.3.0rc0-112-gdcb7b71, nxt is only a guint8* which fails on 32-bit glib before 2.31.2. Change-Id: Ide1816a971fa213f5669a7fa71bc111d5b1cc921 Reviewed-on: https://code.wireshark.org/review/17418 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01ipsec: fix build with old 32-bit glib headersPeter Wu1-1/+1
In commit v2.3.0rc0-121-gb6d13ef, GUINT_TO_POINTER(ah_nxt) was added, but on 32-bit glib before 2.31.2 this results in a type error. Change the type of ah_nxt since all its users take a guint anyway. Change-Id: I2fb030f79011b8a7159a0b0df26d3545b0ce3c06 Reviewed-on: https://code.wireshark.org/review/17419 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01gtk: fix 32-bit buildPeter Wu2-3/+3
32-bit glib before 2.31.2 expand GUINT_TO_POINTER(x) as (gpointer)x. add explicit cast since curr_layer_num is 8 bits. Fixes v1.99.10rc0-179-g1d7bcb2. Storing a 64-bit integer into a 32-bit pointer makes the compiler complain. Add explicit cast. Fixes v1.99.1rc0-76-ged0b19b. Change-Id: I75fdf17882a0f5ddce7d3b3e74b1bf80ff6cd4ae Reviewed-on: https://code.wireshark.org/review/17417 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-31E.212: update list to Operational Bulletin No. 1106 (15.VIII.2016)Pascal Quantin1-135/+289
Also manually add PLMN 460 02 (Chian Mobile) as it is not listed by ITU yet Bug: 12622 Bug: 12798 Change-Id: I7c6fab9dcb9da90178186e94f624301ef1861421 Reviewed-on: https://code.wireshark.org/review/17428 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>
2016-08-31OSSP: Retrieve OUI at proper offset in packetJaap Keuter1-4/+4
Bug: 12801 Change-Id: Ic70f0d93bbffc99ceacf6b2963b04d7477e4914b Reviewed-on: https://code.wireshark.org/review/17425 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31NFS: fix indent (remove some trailing spaces)Alexis La Goutte1-20/+20
Change-Id: Ic72d264686c3b37ac15118eec07057c7bb8a2a50 Reviewed-on: https://code.wireshark.org/review/17422 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>
2016-08-31diam_dict.l: remove use of strdupPeter Wu1-16/+6
This should fix crashes on Windows, _strdup should not be mixed with g_free. This was only uncovered in v2.3.0rc0-474-ga04b6fc, before that ddict_free was never called. Change-Id: I34111385c82715de70fb42fe44b99b89e132a374 Reviewed-on: https://code.wireshark.org/review/17423 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31Win: switch back to Lua library compiled with MinGWPascal Quantin1-12/+4
It does not suffer anymore from bug 9957 Change-Id: I871f01db67101b09a21545ecec5473941997a5cb Reviewed-on: https://code.wireshark.org/review/17416 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>
2016-08-31rftap: add new dissectorJonathan Brucker4-0/+611
The RFtap protocol is a simple metadata header designed to provide Radio Frequency (RF) metadata about frames. For official specifications see: https://rftap.github.io/ Signed-off-by: Jonathan Brucker <jonathan.brucke@gmail.com> Change-Id: I0d008b2baadcc5cc9577113e9795eef2691b961a Reviewed-on: https://code.wireshark.org/review/17355 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31Revert "Revert "diameter: fix 400kb leaked memory on exit""Guy Harris2-9/+38
This reverts commit 5fea2b5f4198f1a36f313ef38532ddffd02ac5b1. I.e., it puts back the change; the reverted version passed the tests on which the versions with this change crashed. Change-Id: Idcc0eb11588cf14e2fe666de1905ee63917b0fcf Reviewed-on: https://code.wireshark.org/review/17413 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31Revert "diameter: fix 400kb leaked memory on exit"Guy Harris2-38/+9
This reverts commit a04b6fcb3db901734ed948134c973996786be8b7. Temporary revert to see if this prevents the "tshark -G" crashes being seen on the 64-bit Windows buildbot. Change-Id: I561439039ca2667b72d7e2319a6f3f5f97e18d15 Reviewed-on: https://code.wireshark.org/review/17412 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31OK, it probably crashed in proto_initialize_all_prefixes().Guy Harris1-2/+0
Remove the debugging printouts. The changes that were committed between the last build that didn't crash and the first build that did were: commit 961f743d69b323aa217a6b39184485d6a0bfb2d5 Author: Peter Wu <peter@lekensteyn.nl> Date: Mon Aug 29 01:34:22 2016 +0200 xml: fix some memleaks No more memleaks reported for the attachment in bug 12790 :-) Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386 Ping-Bug: 12790 Reviewed-on: https://code.wireshark.org/review/17365 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: Peter Wu <peter@lekensteyn.nl> commit a04b6fcb3db901734ed948134c973996786be8b7 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 28 22:19:29 2016 +0200 diameter: fix 400kb leaked memory on exit Before: SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s). After addressing to-do by calling ddict_free: SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s). After fixing all remaining leaks cases in the flex file for diameter: SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s). Not bad huh :-) Ping-Bug: 12790 Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771 Reviewed-on: https://code.wireshark.org/review/17364 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl> commit 14312835c63a3e2ec9d311ed1ffee5285141f4f9 Author: Peter Wu <peter@lekensteyn.nl> Date: Sun Aug 28 19:20:59 2016 +0200 pcapng: do not leak blocks pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if they return, they do not have to set wblock.block to NULL. pcapng_read_block always sets wblock->block to NULL and may initialize it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and ISB. It is better to have more wtap_block_free calls on a NULL value than missing them as this would be a memleak (on the other hand, do not release memory that is stored elsewhere such as SHB and NRB). Ping-Bug: 12790 Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5 Reviewed-on: https://code.wireshark.org/review/17362 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> *If* one of those is the cause, my guess is that it's the Diameter one, as the crash happens before any file is read (so it's probably not the pcapng one) and thus before any dissection is done (so it's probably not the XML dissector one). Change-Id: I816c1bbd6078eab251efd02ebb7c3195f6dd1483 Reviewed-on: https://code.wireshark.org/review/17411 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31GTP: patch for Target identification for non-compliance workaroundBinh Trinh1-0/+7
bug 3974 Change-Id: I2faa473c725a803056d6ffd0cb34b46d75121061 Reviewed-on: https://code.wireshark.org/review/17410 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>
2016-08-31ieee80211: Fix the BAR Ack policy valuesChaitanya T K1-2/+2
As per 802.11-2012 table 8-15 the string should be reverse. 0 - Send Immediate Ack (False) 1 - Dont't Send Immediate Ack (True) Change-Id: Iea3b179e11781f891d2294b0bcdf92de2bdba7ba Reviewed-on: https://code.wireshark.org/review/17394 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>
2016-08-31nfs4: Handle CB_GETATTRTom Haynes1-5/+8
Change-Id: Ifb68af443c6f13dfab99e32488d86c148621a316 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17399 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>
2016-08-31Crashing in proto_initialize_all_prefixes()? Debugging output.Guy Harris2-8/+2
Change-Id: I6db711b1730b95460983ee190762753198c1959e Reviewed-on: https://code.wireshark.org/review/17409 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31MAUSB: Add Cancellation Status values defined in v1.0a SpecSean O. Stalley1-1/+3
Change-Id: I72812fa0650da0cde37ea6cbef81a3c7a9ba333d Reviewed-on: https://code.wireshark.org/review/17373 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>
2016-08-31Debugging printouts, to see why tshark -G crashes on the Win64 buildbot.Guy Harris1-0/+8
Change-Id: I16f6b7a69eed5ec66842df9d0640216fd273d3b0 Reviewed-on: https://code.wireshark.org/review/17408 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31RTPS: Fixed data holder dissection to match the standardJuanjo Martin1-84/+30
The OMG standard has changed in this new version. I have fixed the implementation. Change-Id: Ie9054ed52c66580c76096af86e0fb8e34a44e9d1 Reviewed-on: https://code.wireshark.org/review/17348 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>
2016-08-31nfs: Fix style in switchTom Haynes1-1/+2
Change-Id: Ica9fc960946542badb64af12769e7dfa3793db82 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/17397 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31Use "ecatf" as the protocol name, to parallel everything else.Guy Harris1-1/+1
The fields have names beginning with "ecatf.", the dissector is called "ecatf", and it's only the frame layer of EtherCAT anyway, so just call it "ecatf". Change-Id: I2f127363fd115c307f0525f612fe184a30d46c55 Reviewed-on: https://code.wireshark.org/review/17406 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31Don't do any Decode As stuff for dissector tables not used with Decode As.Guy Harris217-518/+522
Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30RTPS: Allowing duplicates in the rtps.type_name tableJuanjo Martin1-1/+1
Change-Id: Ie7a35b0bb3275a0895fad646bf9a81406eadf37c Reviewed-on: https://code.wireshark.org/review/17393 Reviewed-by: Guy Harris <guy@alum.mit.edu>