aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2019-01-21add variable ie infothomas/dectthomasDOTwtf1-5/+159
2019-01-16add additional DECT typesthomasDOTwtf1-0/+109
2019-01-15added additional 7.4.5 MM valuesthomasDOTwtf1-3/+28
2019-01-05WIP: Initial dissector for DECT NWK layerHarald Welte2-0/+336
Change-Id: Idf0b97ce40ec5b2dd1b507a72fed64cfee288354
2019-01-05dect-dlc: Don't call NWK dissector if there's no payloadHarald Welte1-4/+6
Change-Id: Ia86185f52b724be61db2d94ffaf51fd00ebab84c
2019-01-04WIP: Initial dissector for DECT DLC protocol layerHarald Welte3-2/+306
Change-Id: Iabd75b0f9b12ea9162dc164741123feb1ba7992d
2019-01-04WIP: Dissector for Aastra/Mitel DECT over RAW EthernetHarald Welte2-0/+242
Change-Id: I2c5cebd0fc9eb329f07b89a06045116cf612f422
2019-01-04CRC6: Fixed CRC lookup table and functionsRoss2-5/+7
* Generated code and 256-element lookup table with pycrc * Combined 2 crc6 functions which both have same poly 0x6f and lookup table * Using the example file from the bug report, $ tshark -r ~/Downloads/M1_header_crc.pcapng -V | grep "Calculated CRC" 1101 00.. = Header CRC: 0x34 [Calculated CRC 0x34] Header and Calculated CRC are now both 0x34 (correct value) * pycrc settings for generation: $ python pycrc.py --reflect-in False \ --reflect-out False \ --xor-in 0 \ --xor-out 0 \ --algorithm table-driven --width 6 \ --poly 0x2f * To manually check 3GPP protocol header CRCs, use above command with flag --check-hexstring=<HEADER HEX> Bug: 14875 Change-Id: I283f52fcae10b2f92f107df6988629d49d692428 Reviewed-on: https://code.wireshark.org/review/31356 Reviewed-by: Ross Jacobs <rossbjacobs@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04epan: remove return from functions returning void.Dario Lombardo2-3/+0
Found by clang-tidy. Change-Id: Ibedfec5e5d3eca7c2e65319b7ecb4dcbe974b88b Reviewed-on: https://code.wireshark.org/review/31337 Petri-Dish: Dario Lombardo <lomato@gmail.com> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04Remove a no-longer-needed DIAG_OFF/DIAG_ON pair.Guy Harris1-2/+0
If you're not casting anything, you're not casting away qualifiers, so there's no need to disable warnings about casting away constness. Change-Id: Ib6bb75a8683ce129078a09df385159c13d2cf306 Reviewed-on: https://code.wireshark.org/review/31355 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03epan: remove redundant casts.Dario Lombardo9-17/+17
Found by clang-tidy. Change-Id: Iaf6cf84c33b03ddfcd39a333b49f4987002afa56 Reviewed-on: https://code.wireshark.org/review/31338 Petri-Dish: Dario Lombardo <lomato@gmail.com> Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-03epan: use json_dumper for json outputs.Dario Lombardo2-347/+201
They include -Tjson, -Tjsonraw, -Tek. Change-Id: Ib3d700482ce5c29727c3f778cc3c46a1bf7756c4 Reviewed-on: https://code.wireshark.org/review/31000 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-03GeoNetworking cleanup and minor correctionsChristophe GUERBER2-48/+28
Removes obsoleted dissector tables, cleanup comments, correct elevation display and intx display. Change-Id: I7224bede0cecbbd5cab91630193e17a7e12615b1 Reviewed-on: https://code.wireshark.org/review/31323 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03ieee80211: print the RU Allocation in decimalEmmanuel Grumbach1-2/+2
The RU Allocation is really a decimal number and the standard uses it as a decimal number. It is not a bitmap. Print it in decimal. Change-Id: I2f8ff9798aa1af855ad3c8b0a26704282fe18189 Reviewed-on: https://code.wireshark.org/review/31315 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03knsxip: fix headerAlexis La Goutte2-4/+4
it is no longer Ethereal (=> Wireshark) Change-Id: I2a59aa0ec4e18b05612bbce6ede18db9ae350e49 Reviewed-on: https://code.wireshark.org/review/31317 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03geonw: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+3
Change-Id: Ib1e26cc20ad30889a56455bcf529ba404f14506f Reviewed-on: https://code.wireshark.org/review/31320 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03knxip: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-11/+11
Change-Id: Ifa64a819d50b730eae4a5c2447b502580a871f16 Reviewed-on: https://code.wireshark.org/review/31318 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03Add dissector for Great Britain Companion Specification (GBCS)Kenneth Soerensen2-0/+1772
The Smart Metering Equipment Technical Specifications (SMETS) requires that Gas Smart Metering Equipment (GSME), and Electricity Smart Metering Equipment (ESME) including variants, meet the requirements described in the Great Britain Companion Specification (GBCS). GBCS messages are end-to-end and contains ZigBee, DLMS or ASN.1 formatted payloads. The GBCS messages are transported via IPor via the ZigBee Tunneling cluster. https://smartenergycodecompany.co.uk/document-download-centre/download-info/gbcs-v2-1/ Bug: 15381 Change-Id: I28ca9831fc266a6abd310db103306b98786e63f9 Reviewed-on: https://code.wireshark.org/review/31168 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-03Couchbase: Fixup a shadow variable.Gerald Combs1-4/+4
Rename index to byte_idx. Change-Id: I49d09d6db71d5db9e1c65f2abadc1413b3ccb7ec Reviewed-on: https://code.wireshark.org/review/31313 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-026lowpan: don't try to use (new) TVB that wasn't created.Jeff Morriss1-1/+2
If the IPHC TVB wasn't created then bail out of dissection before trying to use it. Bug: 15217 Change-Id: I6e297590cdf86e13b0185f75f1d409888f2498d8 Reviewed-on: https://code.wireshark.org/review/31308 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-01-02IEEE1609.2: Allow Service Specific Permissions dissectionChristophe GUERBER6-40/+604
IEEE1609 and GeoNetworking secured packets containing certificate contain Service Specific Permission items that was not dissected. This patch allows dissection of SSP both in IEEE1609dot2 dissector and in the geonetworking dissector. It also provides SSP dissectors for ETSI DEN and CA basic services. Change-Id: Ic5efe403f7c4337c7e51a4eab9a9d674d2fe1cf6 Reviewed-on: https://code.wireshark.org/review/31303 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02nas5gs: Add dissection of QoS flow descriptions.Anders Broman1-404/+503
While there renumber according to latest spec. and fix some indentation. Change-Id: Ib9b4590d72c3124ffcb96fd719a9a19cadb4c494 Reviewed-on: https://code.wireshark.org/review/31300 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02Updates and bugfixes of ASTERIX I062Atli Guðmundsson1-168/+323
I062 v1.18 updates (now the default) - Updated I062/380#10.STAT, new enum values (6 & 7) - Added asterix.062/080.SFC - Added asterix.062/080.IDD - Added asterix.062/080.IEC I062 v1.17 updates - Added asterix.062/060.V - Added asterix.062/060.G I062 bugfixes: - Fixed I062 Capitalisation inconsistencies - Fixed I062/080.FPLT, incorrect value mask - Fixed I062/080.SDS, incorrect value mask - Fixed I062/110#1.M5, incorrect name (was I062/110#1.MD5) - Fixed I062/110#4, incorrect abbreviation (was asterix.062_11_04) - Fixed I062/110#4, missing spare bit - Fixed I062/110#4.RES, incorrect value mask - Fixed I062/110#6, incorrect abbreviation (was asterix.062_11_06) - Fixed I062/136.MFL, incorrect abbreviation (was asterix.062_136_ALT) - Fixed I062/245.STI, was missing - Fixed I062/245, did not display anything - Fixed I062/290, incorrect abbreviation, (was asterix.062_) - Fixed I062/295#7.MHG, incorrect name (was I062/295#07.MHD) - Fixed I062/340#4/5, incorrect abbreviations (was asterix.062_340_) - Fixed I062/380#4, incorrect abbreviation (was asterix.062_380_4) - Fixed I062/380#4.IAS, incorrect scaling (depends on IM bit) - Fixed I062/380#6.ALT, incorrect type (was unsigned) - Fixed I062/380#7.ALT, incorrect type (was unsigned) - Fixed I062/380#9.NC, incorrect value mask - Fixed I062/380#9.TD, incorrect field size - Fixed I062/380#9.TTR, incorrect type (was signed) - Fixed I062/380#17.TA, incorrect type (was signed) - Fixed I062/380#19.VUC, incorrect field size - Fixed I062/390#3, incorrect type (was 32-bit), incorrect value mask - Fixed I062/390#n, incorrect abbreviations (was asterix.062_nn) - Fixed I062/500#3.APWLAT, incorrect type (was signed) - Fixed I062/500#3.APWLON, incorrect type (was signed) - Fixed I062/500#n, incorrect abbreviations (was asterix.062_nn) - Fixed I062/510, missing support for slaved trackers - Fixed I062/510.SUD, incorrect name (was I062/510.SID) - Fixed I062/510.SUD, incorrect type (was 24-bit), incorrect value mask - Fixed I062/510.STN, incorrect value mask - Updated I062/RE.CST.SAC/SIC, now reports as asterix.SAC/SIC - Updated I062/RE.CSNT.SAC/SIC, now reports as asterix.SAC/SIC Note: incorrect value masks and field sizes would in most cases cause an exception when trying to decode those fields. Change-Id: If6b9662d20619dd30b4fe28907ab0630c6d55e44 Reviewed-on: https://code.wireshark.org/review/31214 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02Make dissect_icmp_extension_structure into a dissector function.Michael Mann3-22/+13
That way there isn't a need for packet-icmp-int.h. Change-Id: Ib523c36ab2fdf6a43ee6ff32dadfcd53e9d9bf14 Reviewed-on: https://code.wireshark.org/review/31290 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-02dpaux: Minor improvementsMichael Mann3-66/+41
1. Pass dissector data to dpaux dissector directly instead of using p_get_proto_data. 2. Don't assume dissector data will always be present and default to "sink" if that is the case. 3. tvb_memdup isn't needed for proto_tree_add_bytes 4. Use value_string to save switch cases. 5. Bugfix major/minor version dissection. Change-Id: I018d923537ce276fda8be1884f5bb3a8b2eef862 Reviewed-on: https://code.wireshark.org/review/31297 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01lorawan: fix this condition has identical branches [-Wduplicated-branches]Alexis La Goutte1-2/+0
Change-Id: I9bf885dcd9b8c15212062f8e6205816521e707c3 Reviewed-on: https://code.wireshark.org/review/31292 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Erik de Jong <erikdejong@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-01-01Limit the maximum *file* name length for exported objects.Guy Harris1-0/+4
Limiting the maximum *path* name length is bogus; if the user wants to store the file in some directory deep under the root (UN*X) or the root of the drive (Windows), that's their choice - don't prevent them from saving in a directory with a path longer than some maximum or limit the file name based on the length of the path leading up to it. Limiting the maximum *file* name is presumably to cope with, for example, HTTP objects with a URL that had a very long query component, so it makes sense. Change-Id: Idfc7de8124ee80bdd4950341ff2239834eb9f6f6 Reviewed-on: https://code.wireshark.org/review/31295 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-01-01Fixes GeoNetworking secured packets dissectionChristophe GUERBER3-59/+73
Secured packets contain Common and Extended header. Change-Id: I60b5ed35811c19c9596bd142c1315b341d760968 Reviewed-on: https://code.wireshark.org/review/31238 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Use dissector table to dissect content of ieee1609Christophe GUERBER6-21/+113
For unsecured and signed data, the dissector uses a dissector table to determine the next dissector. It uses the psId field to index the table. In the case no psId is provided inside, the caller can set a default psid if it is provided beforehand. If none is provided, data are not dissected. Change-Id: I6f9d6989cd87dd373a155a5b893c460344a0c857 Reviewed-on: https://code.wireshark.org/review/31237 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Z39.50: Eliminate unnecessary header.Craig Jackson2-25/+0
I decided that packet-z3950.h was unnecessary at this time, but I didn't eliminate all trace of it. Change-Id: Iaff41e143bac6bf42779de49f7390ac129cef3e1 Reviewed-on: https://code.wireshark.org/review/31288 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-01-01krb5: fix parsing of PA-S4U-X509-USER in AS-REQIsaac Boukris3-55/+83
Per [MS-SFU] 2.2.2 PA_S4U_X509_USER in AS-REQ consists of the certificate data instead of the corresponding struct. Also, the subject-certificate field in the struct consists of the certificate data as well, so let's decode it as such. Change-Id: I6f03a66eac74b7d42c0893f63cab772d8ddcb803 Signed-off-by: Isaac Boukris <iboukris@gmail.com> Reviewed-on: https://code.wireshark.org/review/31279 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Add a "failed" return for tap packet routines.Guy Harris78-396/+449
This allows taps that can fail to report an error and fail; a failed tap's packet routine won't be called again, so they don't have to keep track of whether they've failed themselves. We make the return value from the packet routine an enum. Don't have a separate type for the per-packet routine for "follow" taps; they're expected to act like tap packet routines, so just use the type for tap packet routines. One tap packet routine returned -1; that's not a valid return value, and wasn't one before this change (the return value was a boolean), so presume the intent was "don't redraw". Another tap routine's early return, without doing any work, returned TRUE; this is presumably an error (no work done, no need to redraw), so presumably it should be "don't redraw". Clean up some white space while we're at it. Change-Id: Ia7d2b717b2cace4b13c2b886e699aa4d79cc82c8 Reviewed-on: https://code.wireshark.org/review/31283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-31Export ITS-AppId/psId names from IEEE1609Christophe GUERBER10-96/+414
PsId and ITS-AID are defined in several documents and listed in ieee1609.12. Put these definitions in ieee1609.2 ASN1 definition and export it so that GeoNetworking and wsmp dissectors may use it. Change-Id: Ia3ac181a4c9092b555decb3ee7c5e78adcece5c0 Reviewed-on: https://code.wireshark.org/review/31236 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31CESoETH: Add dissection of MEF 8 CES over EthernetJaap Keuter4-0/+519
Add dissection of Metro Ethernet Forum specification of Implementation Agreement for the Emulation of PDH Circuits over Metro Ethernet Networks [MEF 8]. This includes the introduction of a RTP shim header dissection function, as is not uncommon in PW and CES services. Signed-off-by: Jaap Keuter <jaap.keuter@aimvalley.nl> Change-Id: I6de81007ce11793cd5352fadadd80d3f6f45ae0d Reviewed-on: https://code.wireshark.org/review/31239 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-12-31Accept v1 of GeoNetworking and improve item treeChristophe GUERBER1-16/+77
Accept version value 1 for geonetworking, dissect last 4 bytes of SHB and traffic class as per EN 302 636-4. Change-Id: I254e48f888aae063d2f4b5178c2e0eadc839f8ea Reviewed-on: https://code.wireshark.org/review/31245 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31SMPP: General improvementsMichael Mann1-913/+841
1. Use proto_tree_add_item (and friends) instead of a protocol specific wrapper for integer types 2. Create #defines for command IDs and properly sort them in the their value_string 3. Improve heuristics for command specific parameters to reduce false positives 4. Use length value in TLV for strings 5. Remove "sub tvb" creation. The tvb passed into the pdu should be used. 6. Use proto_tree_add_bitmask_list and proto_tree_add_bitmask_list_value where applicable 7. Allow empty fields for vendor-specific TLVs. 8. Treat version fields as FT_UINT8 and use format with BASE_CUSTOM 9. Condense all command response codes to a single range_string. Bug: 5206 Bug: 15267 Change-Id: I49751d287af1ebb9e27ae7463c08f4724ee60c07 Reviewed-on: https://code.wireshark.org/review/31267 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31KNET: Validate the length field before claiming packetMichael Mann1-0/+8
Heuristic is weak, but length of packet should be non-zero. Change-Id: I68d6d85092c84d5d421731be3ada008fe7a5b06f Reviewed-on: https://code.wireshark.org/review/31266 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-31GSM over IP: Require a valid message type for dissection.Michael Mann1-10/+24
Protects against some false positives because by default GSM over IP claims some "frequently used" ports. Change-Id: I94736ecef8ac1422bb330a364a3f77edd9a52a2b Reviewed-on: https://code.wireshark.org/review/31265 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30srt: fix not a Doxygen trailing comment [-Wdocumentation]Alexis La Goutte1-10/+10
Change-Id: I78de1d2fc55ac64542d7d031c33c3b4bc58b10ff Reviewed-on: https://code.wireshark.org/review/31199 Reviewed-by: Maxim Sharabayko <maxim.sharabayko@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-30Revert "Add routines to load Lua programs that assume the path is UTF-8 on ↵Peter Wu2-171/+2
Windows." This reverts commit 5953756305388724545f0df46d286be2f02c048a. The public API should not be polluted with Windows-specific hacks. As we already override dofile/loadfile, those should be fixed instead. Ping-Bug: 15118 Change-Id: Ia9d5e64e8ef14032f982f695ffd4cac59067bb17 Reviewed-on: https://code.wireshark.org/review/31134 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29Add support for RSA decryption using PKCS #11 tokensPeter Wu2-0/+224
Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29Lua: fix crash in reloading Lua plugins that use FileHandlerPeter Wu1-18/+43
Reloading Lua plugins did not actually remove registered FileHandler instances which resulted in a use-after-free of lua_State. Fix this by tracking instances and release them in wslua_deregister_filehandlers. Other required fixes to allow reregistration after reloading: - Fix END_FILEHANDLER_ROUTINE not to block all new registrations. - wtap file subtypes are apparently persistent, even after "unregistering". Fix this by looking up the previous subtype that matches the FileHandler short name. Add a small sanity check to wtap_register_file_type_subtypes to prevent internal handlers from being overwritten. This patch creates a potential memleak of registered_file_handlers as wslua_deregister_filehandlers is not called on program exit (yet?). Bug: 13264 Change-Id: I4f5935cde6ff8dc4de333359bad3efca96d4fb9b Reviewed-on: https://code.wireshark.org/review/31068 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-29docsis: enhancements and additions for DOCSIS TLVs 5.20 and 5.40Andrii Vladyka1-4/+7
Change-Id: If819d1f7e75b458d5fc28e23b28fa260637491fb Reviewed-on: https://code.wireshark.org/review/31240 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29Fix typo: aplications to applicationsJim Young2-2/+2
Change-Id: I14948f563a7638b5bd28f4450ffe1bd98a491e6a Reviewed-on: https://code.wireshark.org/review/31243 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29Small cleanups.Guy Harris1-3/+4
Get rid of an extra blank line in a comment. Change another comment to refer to "error packets", as we do elsewhere. Fix indentation. Change-Id: I4d81b8856ea876f20914352f962b1df0e115404c Reviewed-on: https://code.wireshark.org/review/31241 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-28Fixed ASTERIX 6bit callsign decodingAtli Guðmundsson1-10/+11
The callsign was being truncated to 7 letters. This affects the following fields: - I004/100#01.AN - I004/170#08.MS1 - I004/170#08.MS2 - I025/020.SD - asterix.AI, which is included in: -- I021/170 -- I048/240 -- I062/245 -- I062/380#02 -- I062/380#03_v0_17 Change-Id: Idbbb3891d96e906053fc1f0c447e37bae87d207a Reviewed-on: https://code.wireshark.org/review/31230 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28Correct PsId dissection in WSMPChristophe GUERBER1-19/+27
Get rid of length determinant in the value returned for psid. Length determinant is not part of the value. This helps comparison with other protocols possibly containing a psid also. Change-Id: I2bd93bd6849f8bfa686f0574f05b0a65f587e4ad Reviewed-on: https://code.wireshark.org/review/31235 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28DNS: Use seconds as resolution for stat response time.Michael Mann1-3/+3
This keeps it in the same resolution as the dns.time field. Ping-Bug: 15382 Change-Id: Ibacf8761819c0fac2e87fa147f7381336ce5cb39 Reviewed-on: https://code.wireshark.org/review/31223 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28Allow floating point values for stats_treeMichael Mann19-183/+380
Bug: 4234 Change-Id: Ibd59809b2dd9890a7851eb57ef7af384e280a74b Reviewed-on: https://code.wireshark.org/review/31222 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-12-28GTPv2: fix dissection of APN IEPascal Quantin1-35/+29
The total maximum length of the APN with Network Identifier and Operator Identifier is 100 bytes. Bug: 15383 Change-Id: Ib74eac1f18f2235c2788e58370f50eeb9a678357 Reviewed-on: https://code.wireshark.org/review/31225 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>