aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
2018-10-03PROFINET: ARServerblock is correctly dissected.moguz1-5/+5
ARServerBlock function causes MalformedPacket error. Padding in the function is fixed. Change-Id: I498b1f15abcaab2a0be19096939fae5402747b68 Reviewed-on: https://code.wireshark.org/review/29899 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> (cherry picked from commit c3b0bcaed51b80faaed1bdfbfae111ef162f9672) Reviewed-on: https://code.wireshark.org/review/29993
2018-10-03PROFINET: Decoding of DCP SetResBlockbasakkal1-4/+4
At SetResBlock, the field "Response" should be "Option" according to specification. It is corrected. Moreover, hf and display filter are changed. Change-Id: Ieae38616b130efc118673814f9fcee4241e75f05 Reviewed-on: https://code.wireshark.org/review/29988 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-27PROFINET: DynamicFramePacking subframes are decoded.basakkal1-1/+1
Last version of Wireshark can not decode DynamicFramePacking subframes. Changes are implemented to decode subframes. Change-Id: Ifba011418a5211d9599c48d37597a16733dfafa8 Reviewed-on: https://code.wireshark.org/review/29882 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-21ProfiNet: Fix order in AssetManagmentRoland Knall1-4/+4
According to the current Profinet specification in regard to the coding of the AM_DeviceIdentification field, the dissection order of DeviceId and VendorId is in the wrong order. Bug: 15140 Change-Id: I9954619a938db382967104de91e2b905677cc171 Reviewed-on: https://code.wireshark.org/review/29780 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-09-20checkAPIs: Add a max termout count for TRANSUM.Gerald Combs1-1/+2
Change-Id: I241da2d1c2e46947c31743f9527faa5884767ed9 Reviewed-on: https://code.wireshark.org/review/29763 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-19Try to discourage the use of APIs via counting.Gerald Combs4-6/+6
Add the ability to specify maximum function counts for each group to checkAPIs. Add maximum counts for the "termoutput" and "abort" groups where needed. Show summaries in various checkAPI targets. Switch uses of ws_g_warning back to plain g_warning. Change-Id: I5cbddc8c671729e424eed8551f69116d16491976 Reviewed-on: https://code.wireshark.org/review/29721 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-18TRANSUM: fix crash with current top of treePascal Quantin2-3/+7
ssl filters were renamed to tls. Also protect against not found fields to avoid a crash in the future. Change-Id: I181a252557b8261fa134b1331c31096a6205635f Reviewed-on: https://code.wireshark.org/review/29715 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-09-18PROFINET: AM_Reserved is added on AM_FirmwareOnlyInformationbasakkal1-0/+12
block According to specification, AM_FirmwareOnlyInformation is extended with AM_Reserved. Dissection of I&M3 was only for read response. Dissection is also added for write request. Change-Id: I281efa2324416b0f98d22ee4e50f2c8f711e2913 Reviewed-on: https://code.wireshark.org/review/29693 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-14opcua: prevent opcua dissector crash by limiting nesting depthHannes Mezger2-1/+37
The OPC UA types DiagnosticInfo, Variant and ExtensionObject can be nested, which can lead to stack overflows when parsing specially crafted packets. This is fixed by storing the current nesting depth as expert info. The corresponding CVE is https://cve.mitre.org/cgi-bin/cvename.cgi?name=2018-12086 The corresponding security bulletin of the OPC Foundation is https://opcfoundation-onlineapplications.org/faq/SecurityBulletins/OPC_Foundation_Security_Bulletin_CVE-2018-12086.pdf Change-Id: I5f6da3a3e269f6db1b690b77470ddf60045bcedd Reviewed-on: https://code.wireshark.org/review/29645 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-08-21plugins: Minor interface improvementJoão Valverde1-1/+2
Change the plugin compatibility check to make it more convenient to define and check the major.minor Wireshark version. Change-Id: I2a6d2a746682c29504311cce5c457e0a852c3daf Reviewed-on: https://code.wireshark.org/review/29224 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2018-07-21Add a tap "finish" callback, called when a listener is removed.Guy Harris1-1/+1
Change-Id: Ic6c23dbd39d1adf8f730f1c866e409f731947475 Reviewed-on: https://code.wireshark.org/review/28786 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-07-14PROFINET: Refactoringgizem.yurdagul3-1070/+1080
According to the prediction, some new features will be added in the future. I'm working on the implementation of these new features. dissect_PNIO_status is updated as "extern" and transferred to the packet-pn.c. Because upcoming feature will have own c file and it will use this dissection. Thus, dependence between classes will be decreased and duplicated code lines will be prevented. So that future changes will be easier. Change-Id: I067d9582dcc8b9909e5a9bc3ab5f30d3c879b226 Reviewed-on: https://code.wireshark.org/review/28677 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-27TRANSUM: fix crash when switching profilesPeter Wu1-2/+2
"output_rrpd" is NULL when the TRANSUM dissector is disabled (which is the default behavior). When switching to a profile where the dissector is enabled, redissection happens, but without invoking the init routine. This leads to a crash when dissect_transum tries to query "output_rrpd". Fix this by creating the map unconditionally. Use wmem_map_new_autoreset since its contents should be erased for new capture files. Bug: 13697 Change-Id: Iea897da8faf8042dffdc74327d9d1221e5fb155f Fixes: v2.3.0rc0-1887-g78d56e5dd7 ("Cleanup transum post-dissector.") Reviewed-on: https://code.wireshark.org/review/28474 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-21OpcUa: fix in function getExtensionObjectTypeErika Szelleova1-1/+1
The function getExtensionObjectType was not reading the corrects bytes, this sometimes ended in reading outside the buffer and that way exception was raised even for correct packets. Bug: 14465 Change-Id: I5d7d9ca5f43f0afbc93f40487a78709c52f0658a Reviewed-on: https://code.wireshark.org/review/28328 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-06-08PROFINET: ErrorCode2 is updatedGizem Yurdagül1-10/+14
According to specification, pn_io_error_code2_pnio_64 is expanded with new error codes. Change-Id: I1faf6e8f86a075057520ba4615d1d4f07032931d Reviewed-on: https://code.wireshark.org/review/28106 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-31Don't check the CRC if the message isn't big enough to have a CRC.Guy Harris1-3/+6
We should really do a better length check. This also suggests that we might be going past the length if it's too short - should we create a new tvbuff, with tvb_subset_length(), and dissect based on that? Bug: 14780 Change-Id: Iaaab529f34b0168ad74c7b4f3e1b4255504c1b57 Reviewed-on: https://code.wireshark.org/review/27930 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-18Older versions of Clang don't understand -Wpedantic.Guy Harris2-4/+4
Define DIAG_OFF_PEDANTIC and DIAG_ON_PEDANTIC, and have it do nothing on Clang prior to 4.0. Change-Id: Ic6b2e607659db66f3210401024bf3f2239665506 Reviewed-on: https://code.wireshark.org/review/27649 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-14Free g_ptr_array_free-related memory leaksPeter Wu3-3/+3
g_ptr_array_free(a, FALSE) returns "a->pdata". Callers that do not handle this will leak memory (e.g. "tshark -G plugins"). Convert other users to use the return value instead of direct access to "a->pdata". Change-Id: I29835477d587f5f54bf0d94cdae9f375e3da3ce3 Reviewed-on: https://code.wireshark.org/review/27437 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-04l16_mono: fix a typo in CMakeLists.txtPascal Quantin1-1/+1
Change-Id: I344354fa50c14828dd5d430ac6a377766b0afeb6 Reviewed-on: https://code.wireshark.org/review/27328 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-02MATE: fix compilation with gcc 8Pascal Quantin2-2/+12
mate_runtime.c:816:35: error: cast between incompatible function types from ‘void (*)(void *)’ to ‘void (*)(void *, void *)’ [-Werror=cast-function-type] mate_parser.l:401:40: error: cast between incompatible function types from ‘void (*)(mate_config_frame *)’ {aka ‘void (*)(struct _mate_config_frame *)’} to ‘void (*)(void *, void *)’ [-Werror=cast-function-type] Change-Id: I90fbed9c52f6fe43958a0ff11b21f0fe4c23c41a Reviewed-on: https://code.wireshark.org/review/27267 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-01Use common indenting space in headingStig Bjørlykke26-247/+247
Change-Id: I47022f9c7d568ca6d9705ba63c669a980822818a Reviewed-on: https://code.wireshark.org/review/27229 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-22EtherCAT: Fix small bugs for mailbox typeMichalis Kapsalakis1-3/+5
This commit fixes the bug in the EtherCAT dissector for the FoE mailbox type. With this commit, the dissector displays the either foe_efw or foe_data in the ECAT_FOE_OPMODE_DATA, and not both of them as until now. Bug: 14613 Change-Id: I09fc569f5adc5665c64653087c475f7f1d94639a Reviewed-on: https://code.wireshark.org/review/25336 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-04-18Remove more autotools stuff.Guy Harris2-11/+0
Change-Id: I2112e9a24308e2e1c04097df006f32bdf58778c3 Reviewed-on: https://code.wireshark.org/review/27010 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-18Remove autotools build system.Dario Lombardo20-1494/+0
It has been replaced by cmake. Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a Reviewed-on: https://code.wireshark.org/review/26969 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16Forbid leading, duplicated and trailing dots in field namesPeter Wu1-1/+1
In order to simplify the display filter scanner, try to restrict the use of dots ('.') in field names. Forbid leading dots, does not affect current dissectors. Fix '..' typo in fpp dissector and forbid it. Forbid trailing dots after fixing dissectors: some of them just have an excess dot, others are missing a name after the dot. Change-Id: I6e58a04ef0306ee8c16fbf6a3cabb076d7fc69c9 Reviewed-on: https://code.wireshark.org/review/26967 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-10Add, and use, "fetch signed value" for lengths < 40 bits.Guy Harris2-2/+2
Add 8-bit, 16-bit, 24-bit, and 32-bit "fetch signed value" routines, and use them rather than casting the result of the 8/16/24/32-bit "fetch unsigned value" routines to a signed type (which, BTW, isn't sufficient for 24-bit values, so this appears to fix a bug in epan/dissectors/packet-zbee-zcl.c). Use numbers rather than sizeof()s in various tvb_get_ routines. Change-Id: I0e48a57fac9f70fe42de815c3fa915f1592548bd Reviewed-on: https://code.wireshark.org/review/26844 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-09Remove const from fields in a dynamically-allocated structure.Guy Harris2-2/+2
There's no need for them to be const, and that causes compiler warnings when you try to give them a value. Change-Id: I666a03dd443dff462de0fe2e393284f3341535d0 Reviewed-on: https://code.wireshark.org/review/26834 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-09Remove const from fields in a dynamically-allocated structure.Guy Harris1-2/+2
There's no need for them to be const, and that causes compiler warnings when you try to give them a value. Change-Id: Ib9bb034f3876abb7e86b6c9f41ebdd35192b5af3 Reviewed-on: https://code.wireshark.org/review/26831 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-26dcerpc-pn-io (profinet): Fix Dead Store (Dead assignement/Dead increment) ↵Alexis La Goutte1-1/+0
Warning found by Clang Change-Id: I8dd3fe09d7b5d3132814e3531314220f600746ba Reviewed-on: https://code.wireshark.org/review/26649 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-22PROFINET: Am_location dissection was wrong byte order.Gizem Yurdagul1-48/+96
Dissection is updated according to spec. Unnecessary tab and spaces are removed. Change-Id: Ia9b3252f5e9dcdc3617286a802fffeef250888c2 Reviewed-on: https://code.wireshark.org/review/26542 Reviewed-by: Birol Capa <birol.capa@siemens.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-03-21l16 (plugins/codecs): fix no previous prototype for ‘codec_register_l16’ ↵Alexis La Goutte1-0/+2
[-Wmissing-prototypes] Change-Id: I5f3bd624f2c5b327e40194fc29f34a11cfd48267 Reviewed-on: https://code.wireshark.org/review/26568 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-03-13Removed assert which was only used for debugging.ciechanowski1-6/+1
Change-Id: I647f023e0e40c90a71b3328717c7ab9eaf30aac5 Reviewed-on: https://code.wireshark.org/review/26461 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-11gryphon: fix 'gryphon.usdt.action_flags' exists multiple times with NOT ↵Alexis La Goutte1-1/+1
compatible types: FT_BOOLEAN and FT_UINT8 Change-Id: Id273b1f80728042122b6bfa3053d263b25f6bdbe Reviewed-on: https://code.wireshark.org/review/26412 Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-03-08gryphon: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I08b59156dbe537c6c4a6b3502ab469c88e984b67 Reviewed-on: https://code.wireshark.org/review/26357 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-08gryphon(.h): fix indent (use 4 spaces)Alexis La Goutte1-324/+324
Change-Id: Ic3ba745e22b5c28ffb8dd9d7fe513c4d86f3d603 Reviewed-on: https://code.wireshark.org/review/26360 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-08The routines that implement a codec don't need to be public.Guy Harris1-5/+5
Pointers to them are passed to register_codec(), so they can be static to l16decode.c. Change-Id: I2303cc4374e81a2e5a77eaa275ca601d99a4f608 Reviewed-on: https://code.wireshark.org/review/26355 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-07Gryphon Protocol dissector fixes and updates.ciechanowski5-122/+2579
These updates fix the incorrect "malformed packet" errors. The updates include Gryphon Protocol commands that were not included in the prior version of the Gryphon dissector. Specifically, added LIN Protocol commands for LDF files, LIN ioctls, LIN signal conversion commands, and USDT ISO-15765-2 commands. Change-Id: I746aa871d8496f3a73374eefd52ed900a069d16b Reviewed-on: https://code.wireshark.org/review/26269 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07spdx: more licenses converted.Dario Lombardo13-169/+13
Change-Id: I3861061ec261e63b23621799e020e811ed78a343 Reviewed-on: https://code.wireshark.org/review/26333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-28L16_mono: Add L16 monaural codec plugin as functional exampleJaap Keuter6-1/+206
This codec plugin serves a dual purpose. First it is to add L16 codec suppport to Wireshark. Second it is an illustration of a basic codec plugin module. Change-Id: I64394dab3257ae49dece0257b16cd969503918e2 Reviewed-on: https://code.wireshark.org/review/26131 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-23mate: change strcmp in g_strcmp0 that supports NULL (found by clang).Dario Lombardo1-1/+1
Change-Id: I66e6183a4f356adfdfd9c55b7b39245a9913857e Reviewed-on: https://code.wireshark.org/review/25988 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-02-17Don't have CLEAN_FILES variables for the "clean" source files.Guy Harris14-84/+19
Except for the one directory that (currently) has "not yet clean" files, epan/dissectors, we don't need a separate variable to keep track of the "clean" source files. In the cases where not all files were in CLEAN_FILES, put them into the variable used to enable -Werror or its equivalent. Change-Id: Ic4119861c1d9e381adfe31e9977e1ac71d623f5b Reviewed-on: https://code.wireshark.org/review/25830 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-17Use -Werror except for explicitly listed dirty dissectors.Guy Harris2-2/+2
Use AM_CFLAGS for everything except for libdirtydissectors in epan/dissectors. Rename GENERATED_CFLAGS/GENERATED_CXXFLAGS to DIRTY_CFLAGS/DIRTY_CXXFLAGS, as it doesn't apply to all generated files. Change-Id: I702b53e185d6972c08d68ef31c05df7b03669daa Reviewed-on: https://code.wireshark.org/review/25829 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-16Use DIAG_OFF_FLEX/DIAG_ON_FLEX more consistently.Guy Harris1-13/+8
Add warning C4267 (size_t to int conversion) with MSVC to DIAG_OFF_FLEX. Addd -Wshorten-64-to-32 with Clang and GCC to DIAG_OFF_FLEX. Don't explicitly use #pragma to turn off warnings; use DIAG_OFF_FLEX for all of them. If we use DIAG_OFF_FLEX, use DIAG_ON_FLEX, even if we have no section of entirely included code at the end. Change-Id: Ibfd44e8954704e9a8bcb1bd8e54f31d28357fffb Reviewed-on: https://code.wireshark.org/review/25817 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-16Add DIAG_OFF_FLEX and DIAG_ON_FLEX for use in Flex scanners.Guy Harris1-8/+8
DIAG_OFF_FLEX turns off all warnings that we want to disable for Flex-generated code due to some versions of Flex generating code that triggers those warnings. DIAG_ON_FLEX restores those warnings, so we do the checks for code that *we* wrote. Use them in .l files. Change-Id: I613a20309a30cd4c61111a1edbe27a5d05fcbf59 Reviewed-on: https://code.wireshark.org/review/25815 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-15Disable warning C4267 in generated files.Gerald Combs1-0/+6
Disable warning C4267 in Visual C++ in order to squelch the following warnings: 125>dtd_parse.c(1699): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\epan\epan.vcxproj] 125>diam_dict.c(2348): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\epan\epan.vcxproj] 125>C:/buildbot/builders/windows-x86-64-petri-dish/windows-x86-64-petri-dish/build/cmbuild/epan/uat_load.c(1476): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\epan\epan.vcxproj] 130>wimaxasncp_dict.c(2103): warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data [C:\buildbot\builders\windows-x86-64-petri-dish\windows-x86-64-petri-dish\build\cmbuild\plugins\epan\wimaxasncp\wimaxasncp.vcxproj] Change-Id: Ie29ae096e5a8b5037abaf3f2aa97754260f4cace Reviewed-on: https://code.wireshark.org/review/25800 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>
2018-02-13Make the DOCSIS dissector a built-in dissector.Guy Harris11-17888/+0
Stuff that calls it is built in, and stuff it calls is built in, so there's not much point in having it be a plugin; we already have examples of plugin dissectors. Change-Id: I512e0fda62faedb5f03f476fbece2e267e1d644f Reviewed-on: https://code.wireshark.org/review/25775 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-09plugins: use SPDX identifiers.Dario Lombardo153-1766/+153
Change-Id: I8155573933daeb69c6e4c95c6702bdd6fc1fa89b Reviewed-on: https://code.wireshark.org/review/25707 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-09Generalize wtap_pkthdr into a structure for packet and non-packet records.Guy Harris1-16/+16
Separate the stuff that any record could have from the stuff that only particular record types have; put the latter into a union, and put all that into a wtap_rec structure. Add some record-type checks as necessary. Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2 Reviewed-on: https://code.wireshark.org/review/25696 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.Dario Lombardo6-6/+6
The first is deprecated, as per https://spdx.org/licenses/. Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed Reviewed-on: https://code.wireshark.org/review/25661 Petri-Dish: Anders Broman <a.broman58@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-04Have individual plugin CMakeLists.txt files add library dependencies.Guy Harris15-1/+29
This removes any knowledge of plugin types from cmake/modules/WiresharkPlugin.cmake, so that it doesn't have to be changed if we add a new plugin type. Revert to the second argument to add_plugin_library() and install_plugin() being the subfolder. Change-Id: I668ab90b28c73a8b12ca8e3e906b8de2f9395ca5 Reviewed-on: https://code.wireshark.org/review/25585 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>