aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/profinet
AgeCommit message (Collapse)AuthorFilesLines
2016-07-03profinet, CID 1362120: check the return value of ftell()Martin Kaiser1-11/+14
change filePosRecord's data type to long, this is what ftell() and fseek() expect limit filePosRecord's scope to the block where it's actually used if ftell() returns < 0, don't move the file pointer and don't call fseek() with the negative offset Change-Id: If5a43099c32e476a691f4d6cd26ed7fb73490fcf Reviewed-on: https://code.wireshark.org/review/16258 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-03profinet: add a space to make checkhf happyMartin Kaiser1-1/+1
without the space, checkhf complains about an ei entry martin@reykholt:~/src/wireshark.git$ ./tools/checkhf.pl plugins/profinet/packet-dcerpc-pn-io.c ERROR: NO ARRAY: plugins/profinet/packet-dcerpc-pn-io.c, ei_pn_io_unsupported Change-Id: Ie72efcec644225bc4f554117ae10672694823cad Reviewed-on: https://code.wireshark.org/review/16257 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-06-30Remove Makefile.common filesJoão Valverde2-56/+28
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-15Remove Nmake build systemPascal Quantin3-118/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-02profinet: set ioDataObject structure to 0Pascal Quantin1-1/+1
Bug: 12486 Change-Id: I9e8be44325e0bdd5174bd01e4e1ea4922f7090cc Reviewed-on: https://code.wireshark.org/review/15696 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-27Don't use "== {TRUE,FALSE}" when testing whether a Boolean is true or false.Guy Harris1-28/+30
"if (boolean)" suffices to test for true, and "if (!boolean)" suffices to test for false. Most of the time, explicitly comparing against TRUE or FALSE is harmless, although possibly slightly less efficient, as you're explicitly testing against 1 rather than testing for "not zero". *However*, if you want to test whether a given bit is set in a flags field, "if ((flags & flagbit) == TRUE)" *DOES NOT WORK* unless "flagbit" is equal to 1, because TRUE is equal to 1, and if "flagbit" is not equal to 1, "flags & flagbit" will *NEVER* be equal to 1. So comparing "== TRUE" is a bad habit to get into, as it might lead to its use when doing bit testing. While we're at it, clean up some other tests: "if (!(x == FALSE))" really means "x is true", so write it as such, i.e. "if (x)"; if (a && b) do this; if (a && !b) do that; reads better as if (a) { if (b) do this else do that } when doing bit testing, there's no need to shift the bit, just test it (and, no, that doesn't conflict with the bit about TRUE being 1 - *just test the bit*, it's the standard C idiom). Fixes CID 1362119. Change-Id: I011154caae45307796ffd270d265c05a2533b1db Reviewed-on: https://code.wireshark.org/review/15585 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-26Cyclic PROFINET PROFIsafe RTC1 data dissectionT. Scholz8-113/+2042
New implemented functions for profinet plug-in to read cyclic RTC1 data frames more detailed and further to dissect PROFIsafe on PROFINET frames. New functions include: - Reading the PROFINET "Ident OK" Frame for detailed module information, as ModuleIdentNr., SubModuleIdentNr., etc. total dynamically - Improved the existing dissection of fParameter with usage of GSDML-files, as the indexnumber for those parameters can change - Reading a GSDML-file for further module-information, such as PROFIsafe Module, etc. - Aded new pnio protocol preferences, in which the user can define its own network path to his GSDML-files, so that Wireshark is able to read those files for detailed information output. - Added new filter functions for PROFINET and PROFIsafe - All gained and saved information will be used to dissect the cyclic PROFINET frames Bug: 12216 Change-Id: I379da1d349fa099047953042f1aa30450bee5b30 Reviewed-on: https://code.wireshark.org/review/14119 Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Birol Capa <birol.capa@siemens.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-02Add checkAPI calls to CMake.Graham Bloice1-0/+12
This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-15Remove empty filesJoão Valverde2-0/+0
Change-Id: I9b5b78ca26dd1190e43d2e7e953f4fb119921103 Reviewed-on: https://code.wireshark.org/review/14927 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-20Create call_data_dissector() to call data dissector.Michael Mann1-3/+1
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann2-2/+2
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-0/+4
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-20autotools: Move common automake code for plugins to an include fileJoão Valverde1-65/+2
Change-Id: Icac1eb17ff78ae5ae54b61820618bf3c5733bd96 Reviewed-on: https://code.wireshark.org/review/14003 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-12Profinet (pn-mrp): fix statement is indented as if it were guarded by... ↵Alexis La Goutte1-16/+16
[-Werror=misleading-indentation] found by gcc6 Change-Id: I1d8709857cf3e1e65bca0c0c94629c47fc1a3c06 Reviewed-on: https://code.wireshark.org/review/13903 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-8/+1
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-25Move the proto data stuff out of frame_data.[ch].Guy Harris2-0/+2
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-24Add the packet number to the packet_info structure, and use it.Guy Harris2-27/+27
That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-11new_create_dissector_handle -> create_dissector_handle for plugins.Michael Mann2-2/+2
Change-Id: I0d485b1337c669291ad58b6c096657ce2db353c8 Reviewed-on: https://code.wireshark.org/review/12516 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-11new_register_dissector -> register_dissector for remaining uses.Michael Mann1-1/+1
Mostly plugins, but also LUA and generated skinny dissector. Change-Id: Ifeb4205442f9a60875266b4e82841ff38b4fdb63 Reviewed-on: https://code.wireshark.org/review/12515 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-25Profinet: All SubframeData elements are not decodedBirol Capa1-4/+7
In PDevData/PDirSubframeData/SubframeBlock, not all SubframeData elements are decoded/shown. However, all bytes of the SubframeBlock are highlighted in the binary stream correctly. Change-Id: Ic69999dff524e2e0c48a619def111c4bf9cca5e1 Reviewed-on: https://code.wireshark.org/review/12100 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-25Profinet: ARProperties that contains Combined Object Container BitBirol Capa1-6/+45
New ARProperties has a bit that contains if usage of Combined Object Container is required or not. Change-Id: Ia4420cdf161d79933fcc0d8ffb411c02bfe26f3b Reviewed-on: https://code.wireshark.org/review/12098 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-24Developers Guide updates for plugins with CMakeGraham Bloice1-1/+1
Remove references to nmake, add references to CMake. Change-Id: Iea2d2b2fbdbab131bae823d5d6a5306630a70347 Reviewed-on: https://code.wireshark.org/review/12079 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-19Profinet: use pinfo pool to build conversation filterPascal Quantin1-9/+7
Packet pool cannot be used from GUI. Bug: 11730 Change-Id: I4f5764a38a10809373c365ecf1ea50404a15b89a Reviewed-on: https://code.wireshark.org/review/11966 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-11-18create_dissector_handle -> new_create_dissector_handle for pluginsMichael Mann2-9/+9
Was able to actually convert all calls to "new style" Change-Id: If9916a4762d410f2ad12aa5431174d7462dc7ac4 Reviewed-on: https://code.wireshark.org/review/11941 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-11-04Don't allow DCE/RPC dissector table to have duplicatesMichael Mann1-3/+12
Add "placeholders" in Profinet dissector to make that possible. Change-Id: I000069ec72b5810c5675a30df1c121aa179000b3 Reviewed-on: https://code.wireshark.org/review/11557 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-29"Color dissector filters" are just filters.Guy Harris2-7/+7
Rename the color_dissector_filters.[ch] files to just dissector_filters.[ch], and rename the routines not to include the string "color_", as those filters can be used as color filters *or* display filters. Remove "color_" from other places where we're not doing colorization. In the GTK+ code, combine the two loops that add menu items for filters in the dissector-provided filters list into one. Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c Reviewed-on: https://code.wireshark.org/review/11379 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-27Replace all "dissector filter" registrations with "dissector color filter" ↵Michael Mann1-5/+5
registration. In the GTK, there was "colorize" (via context menu using color_dissector_filter.{c,h}) or "not colorize" (via main menu using dissector_filters.{c,h}). In Qt, you have the option to colorize (via context menu using color_dissector_filter.{c,h}) or not colorize (via main menu using color_dissector_filter.{c,h}). Combine all into "colorize" and convert GTK to use color_dissector_filter.{c,h} in the "not colorize" main menu like Qt. Change-Id: Ib3ca1c822f5f66ab5b812632d808f7905b328483 Reviewed-on: https://code.wireshark.org/review/11263 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-24More ADDRESS macro to address function conversions.Gerald Combs3-11/+11
Replace remaining calls to SET_ADDRESS, CMP_ADDRESS, ADDRESSES_EQUAL, COPY_ADDRESS, and COPY_ADDRESS_SHALLOW with their lower-case equivalents. Replace all ADD_ADDRESS_TO_HASH calls with add_address_to_hash. Change-Id: I4cff857d7a84085abe0bccd52d2605d2a468bf6f Reviewed-on: https://code.wireshark.org/review/11229 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>
2015-10-20Profinet: Add Watchdog Factor data field in IOCRBlockReq.Thomas Wiens1-1/+7
The Watchdog Factor was displayed as Data Hold Factor, which was wrong. Attribute type of the Watchdog Factor is also Unsigned16. Change-Id: Ic5f32b9b322c225361be50b1f4a3180638a0c88b Reviewed-on: https://code.wireshark.org/review/11161 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-10-16CMake: Add /WXGerald Combs1-2/+2
Add "/WX" to the Visual C++ compiler flags if DISABLE_WERROR is off, similar to config.nmake. We haven't compiled C++ code with -Wshorten-64-to-32 for quite some time so there's no need to add -Wno-shorten-64-to-32 in ui/qt/CMakeLists.txt. Additionally, squelch ---- C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3050) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3065) : see reference to function template instantiation 'void std::_Median<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3127) : see reference to function template instantiation 'std::pair<_RanIt,_RanIt> std::_Unguarded_partition<_RanIt,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3157) : see reference to function template instantiation 'void std::_Sort<_Iter,int,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Diff,_Pr)' being compiled with [ _Iter=QList<QString>::iterator , _RanIt=QList<QString>::iterator , _Diff=int , _Pr=bool (__cdecl *)(const QString &,const QString &) ] .\rpc_service_response_time_dialog.cpp(130) : see reference to function template instantiation 'void std::sort<QList<QString>::iterator,bool(__cdecl *)(const QString &,const QString &)>(_RanIt,_RanIt,_Pr)' being compiled with [ _RanIt=QList<QString>::iterator , _Pr=bool (__cdecl *)(const QString &,const QString &) ] C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3051) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3052) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE\algorithm(3053) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data (.\rpc_service_response_time_dialog.cpp) ---- in both rpc_service_response_time_dialog.cpp and wireshark_application.cpp so that we'll compile successfully. Change-Id: I457bcede99dcb1f3c1001f1f559c4901bb000357 Reviewed-on: https://code.wireshark.org/review/10533 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-17Remove all preferences related to enabling/disabling heuristic dissectors.Michael Mann6-7/+7
The preferences are still supported for backwards compatibility, but the heuristic_protos file has final say on the "preference" to enable/disable a heuristic dissector. Also add parameter to heur_dissector_add() for the "default" enable/disable of a heuristic dissector. With this parameter, a few more (presumably weak) heuristic dissectors have been "registered" but of course default to being disabled. Change-Id: I51bebb2146ef3fbb8418d4f5c7f2cb2b58003a22 Reviewed-on: https://code.wireshark.org/review/9610 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-12Add "user presentable" and "unique string ids" to heuristic table entries.Michael Mann6-7/+7
This allows better presentation of heuristic dissectors to the end user. Change-Id: I2ff3985ab914e83c2989880cc0c7b9904045b3f6 Reviewed-on: https://code.wireshark.org/review/9602 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-03plugins: add cleanup routinesPeter Wu3-16/+16
Destroy the reassembly tables on exit, fix memleak in profinet dissector. Change-Id: Id34dbfde42fe715513997452f87cd4fdc328e294 Reviewed-on: https://code.wireshark.org/review/9229 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-17Profinet: I&M5 Data is added.Birol Capa1-1/+109
This optional attribute allows identifying separately orderable OEM parts used to built the device. It consists of the following attributes: Number Of Entries, IM Annotation, Vendor ID, IM Order ID, Serial Number, Hardware Revision, Software Revision Change-Id: I793f6ecd798f93e7f40e8e1a42e42a7070a4a1c1 Reviewed-on: https://code.wireshark.org/review/8955 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-15Profinet: Combined Object Container is added.Birol Capa2-3/+50
An IO device may define so called “combined objects”. A particular combined object is a group of related submodules, e.g. an interface and its ports. The Combined Object Container holds the parametrization for all submodules. Change-Id: Ifb6c63d2c3a1d3cf2cf100a8f54cf0eafa84fe6c Reviewed-on: https://code.wireshark.org/review/8853 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>
2015-06-08Profinet: OEM Device ID is addedBirol Capa1-1/+32
The Device ID of the OEM part may additionally be offered using OEM Device ID Change-Id: Ic51cc4c05a41a8d18f265fb1abab739d1e82e28a Reviewed-on: https://code.wireshark.org/review/8832 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-04Profinet: Add Fiber Optic Diagnosis Info.Birol Capa1-0/+28
This make reading fiber optic diagnosis data possible. Change-Id: I90b49443ffa1b69912d37cbf7a751328eec9d590 Reviewed-on: https://code.wireshark.org/review/8750 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-17Fix CMake warningsGraham Bloice1-3/+3
Newer versions of CMake generate warnings about the use of @variable@ references, replace @CPACK_PACKAGE_NAME@ with ${CPACK_PACKAGE_NAME} Set the policy for CMP0026 to be old to squelch warnings about the use of target LOCATION Change-Id: I424083260c51875dde80f98a23d6528c31ff0aec Reviewed-on: https://code.wireshark.org/review/7977 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-06profinet: remove tvb_length deprecated APIEvan Huus4-12/+12
Change-Id: Ie6f607d86235c0e2d4fc95f77a7500c1636da934 Reviewed-on: https://code.wireshark.org/review/7936 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-03-03Eliminate e_uuid_t in favor of e_guid_t.Guy Harris9-89/+89
That eliminates a redundant and confusing data type, and avoids issues with one piece of code using e_uuid_t but wanting to use routines expecting an e_guid_t. Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60 Reviewed-on: https://code.wireshark.org/review/7506 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-03plugins: fix dissector registration with CMakePeter Wu1-0/+1
Noticed when comparing output of `tshark -G fields` between autofoo and cmake builds. With this change, I see no differences anymore. While only WiMax needs this change, do a similar thing for consistency with autofoo and between dissectors (actually, the contents of ${PLUGIN_FILES} minus plugin.c was used). Change-Id: Ib61f69dcc0b8eda713da931b6cc3e946848bea9d Reviewed-on: https://code.wireshark.org/review/7462 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-02-10Remove unneeded includes from plugins folderMartin Mathieson2-4/+0
Change-Id: Ifdad0fb786a97a6f84a64d442fcca0c20116552f Reviewed-on: https://code.wireshark.org/review/7059 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-01-20CMake: Set an output directory for plugins.Gerald Combs1-40/+3
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-11Fix CMake generation and use of Windows .rc filesGraham Bloice2-2/+26
CMake now generates local copies of .rc files for all the Windows components and uses the files in the build of the components. The .rc.in files that include an icon were modified to allow the icon path to be set by CMake. The path is removed for nmake builds. Updated build architecture detection, required for wireshark.manifest.in Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8 Reviewed-on: https://code.wireshark.org/review/6482 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-08guid_to_ep_str -> guid_to_strMichael Mann1-8/+11
guid_to_str now uses wmem allocation. Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359 Reviewed-on: https://code.wireshark.org/review/6391 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-06[PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bitsAnish Bhatt1-2/+5
Fix the correct code path this time. Bug: 10753 Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860 Reviewed-on: https://code.wireshark.org/review/6335 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits"Anish Bhatt1-8/+8
This reverts commit 0452f763fb0dd2cf7e38f0a127c306199a814c3e. Changes should have been made in ChannelProperties instead of Submodule state. Current implementation merely *appears* to be correct as we are reading it as a two bit value but instead should be addressing it as individual bits, little endian Bug: 10753 Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6 Reviewed-on: https://code.wireshark.org/review/6334 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-03[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bitsAnish Bhatt1-8/+8
Bug: 10753 Change-Id: Ib5522eba5c1d9107219ee2d70c96899ba6f22ca1 Reviewed-on: https://code.wireshark.org/review/6258 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier1-1/+1
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-31Remove proto_tree_add_text from packet-dcerpc-pn-io.cMichael Mann1-3/+7
Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d Reviewed-on: https://code.wireshark.org/review/6152 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 14:27:38 +0000