aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/profinet
AgeCommit message (Collapse)AuthorFilesLines
2013-12-19Rename more to_str functions to have ep_ in the name if they return ephemeralEvan Huus1-6/+6
buffers. Remove two unused functions. svn path=/trunk/; revision=54250
2013-12-14Take a preemptive strike at some likely future VS Code Analyzer warnings ↵Chris Maynard1-3/+10
about strings possibly not being zero-terminated. svn path=/trunk/; revision=54098
2013-12-14Prevent VS Code Analyzer warning; (AFAICT: not an actual bug).Bill Meier1-0/+3
svn path=/trunk/; revision=54096
2013-12-14Remove not needed ';'Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=54088
2013-12-13Fix Visual Studio Code Analysis warning C6054: String 'szStr' might not be ↵Chris Maynard1-0/+2
zero-terminated svn path=/trunk/; revision=54049
2013-11-23Create the ability to have packet scoped "proto" data. Bug 9470 ↵Michael Mann1-3/+3
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+2
svn path=/trunk/; revision=53230
2013-11-09Include <epan/to_str.h> only when needed.Jakub Zawadzki2-0/+2
svn path=/trunk/; revision=53189
2013-11-06Remove pinfo->private_data from DCERPC dissectors and instead have ↵Michael Mann3-622/+601
dcerpc_info* infomation be passed in as a function parameter. Bug 9387 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9387) All "generated" source was manually modified (with the power of search/replace), but I believe the "source input" files have been adjusted (checked into revs 53098 and 53099) to reflect the necessary changes (with possible whitespace formatting differences). The Microsoft compiler doesn't flag "unused function parameters", so I apologize in advance if I may have missed a few. The "dcerpc_info* di" parameter is used in almost every function. svn path=/trunk/; revision=53100
2013-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier4-9/+7
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-24Remove profinet_conv member of struct _packet_info and turn it into proto_data.Michael Mann1-6/+5
svn path=/trunk/; revision=52806
2013-10-23Fix (using '#if 0') a few more [-Wunused-const-variable] warningsBill Meier4-0/+13
svn path=/trunk/; revision=52799
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice1-0/+1
using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-09-17emem -> wmemPascal Quantin4-57/+57
svn path=/trunk/; revision=52130
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann4-126/+126
svn path=/trunk/; revision=51850
2013-09-08Convert profinet dissector to use filterable expert info.Michael Mann3-153/+197
NOTE: Some of the expert group values may need to be checked, PI_UNDECODED doesn't always seem like the right choice. I thought PI_PROTOCOL should be used more. This concludes the conversion expert_add_info_format for all dissectors (where the function isn't commented or #defined out). Onto the "internal" (epan/lua) uses of the call. svn path=/trunk/; revision=51841
2013-09-02Fix Function call argument is an uninitialized value Warning found by ClangAlexis La Goutte1-1/+1
packet-dcerpc-pn-io.c:9101:29: warning: Function call argument is an uninitialized value tvbuff_t *new_tvb = tvb_new_subset(tvb, offset, u32RecDataLen, u32RecDataLen); ^ ~~~~~~~~~~~~~ svn path=/trunk/; revision=51687
2013-09-02Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+0
svn path=/trunk/; revision=51680
2013-08-27Enhance Profinet MRP (Merge LinkUp and LinkDown)Alexis La Goutte1-74/+23
svn path=/trunk/; revision=51548
2013-08-16packet-dcerpc-pn-io.c: In function 'dissect_PNIO_C_SDU':Anders Broman1-1/+1
packet-dcerpc-pn-io.c:9220: warning: unused parameter 'drep' svn path=/trunk/; revision=51390
2013-08-16From Wido Kelling:Anders Broman1-1/+2
wrong interpretation of first byte in userdata of profinet data. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9039 svn path=/trunk/; revision=51389
2013-08-13Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9035 :Pascal Quantin1-5/+11
Indicate the right direction in info column svn path=/trunk/; revision=51333
2013-07-17Remove fragment_data, add fragment_head, fragment_item - for now alias it to ↵Jakub Zawadzki1-2/+2
the same structure. This is begin of work to split fragment head and fragments items. svn path=/trunk/; revision=50708
2013-07-16Bail in the profinet heuristics if we don't have source and destination macEvan Huus1-1/+7
addresses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8904 svn path=/trunk/; revision=50651
2013-07-15Fix warning: ISO C does not allow extra ';' outside of a function.Chris Maynard1-2/+3
svn path=/trunk/; revision=50638
2013-07-14Use tvb_new_chain with the tvbuffs from a reassembly.Guy Harris1-2/+2
svn path=/trunk/; revision=50585
2013-07-14A fragment_data structure now contains a pointer to a tvbuff to theGuy Harris1-6/+4
fragment or reassembled data, not a pointer to the data itself; instead of having to construct a tvbuffs for the reassembled data, we can now just use the existing tvbuff. Spell out "fragment" and "fragmentation" in comments while we're at it. svn path=/trunk/; revision=50584
2013-07-06Add our license header to plugin moduleinfo.h files. Cleans up a batch ofEvan Huus1-0/+23
licensecheck warnings. svn path=/trunk/; revision=50407
2013-07-01Fix Coverity CID 1035326 (Improper use of negative value) by guarding ↵Chris Maynard1-0/+2
against tvb_reported_length_remaining() possibly returning -1. #BACKPORT(1.10,1.8) svn path=/trunk/; revision=50301
2013-06-30Add a question about whether hf_pn_rt_frag_data should be FT_STRING or FT_BYTES.Jeff Morriss1-0/+2
svn path=/trunk/; revision=50261
2013-05-29Batch (some of) the plugins to filterable expert infos. The Profinet plugin ↵Michael Mann3-6/+36
started to get a bit complex in determining filter names (especially the DCOM stuff), so I'll leave that to someone more familiar with the protocol. svn path=/trunk/; revision=49624
2013-04-09Coverity CID 751101: Logically Dead CodeMartin Kaiser1-1/+1
my assumption is that this was a typo check should be for u8BlockVersionLow>2 there's code to handle u8BlockVersionLow 0, 1 and 2 svn path=/trunk/; revision=48805
2013-04-09fix indentingMartin Kaiser1-36/+36
svn path=/trunk/; revision=48804
2013-03-22Don't wire into the reassembly code the notion that reassemblies shouldGuy Harris1-4/+6
be done on flows from one address to another; reassembly for protocols running atop TCP should be done on flows from one TCP endpoint to another. We do this by: adding "reassembly table" as a data structure; associating hash tables for both in-progress reassemblies and completed reassemblies with that data structure (currently, not all reassemblies use the latter; they might keep completed reassemblies in the first table); having functions to create and destroy keys in that table; offering standard routines for doing address-based and address-and-port-based flow processing, so that dissectors not needing their own specialized flow processing can just use them. This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where the second YPALL response is processed as if it were a continuation of a previous response between different endpoints, even though said response is already reassembled), and also allows the DCE RPC-specific stuff to be moved out of epan/reassembly.c into the DCE RPC dissector. svn path=/trunk/; revision=48491
2013-03-19From Michal Labedzki:Anders Broman1-1/+1
Fix some compilation errors in dumpcap/plugins https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304 svn path=/trunk/; revision=48413
2013-03-12From David Arnold:Jaap Keuter1-1/+1
Replace use of INCLUDES with AM_CPPFLAGS in all Makefiles to placate recent autotools. svn path=/trunk/; revision=48261
2013-03-03ENC_BIG_ENDIAN -> ENC_NA (as found by fix-encoding-args.pl)Pascal Quantin1-1/+1
svn path=/trunk/; revision=48040
2013-03-03From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 :Pascal Quantin6-82/+82
Remove C++ incompatibilities from profinet plugin svn path=/trunk/; revision=48039
2013-03-01Export libwireshark symbols using WS_DLL_PUBLIC defineBalint Reczey1-1/+1
Also remove old WS_VAR_IMPORT define and related Makefile magic everywhere in the project. svn path=/trunk/; revision=47992
2013-02-26Fix spelling/typos found using a list of commonly misspelled words.Bill Meier1-1/+1
The misspellings were mostly in comments but some were in text strings visible to the user. svn path=/trunk/; revision=47899
2013-02-26it's ==> its & its == > it's as needed.Bill Meier3-13/+13
svn path=/trunk/; revision=47893
2013-02-10Comment out numerous unused hf_.... instances found by checkhf.Bill Meier4-14/+42
svn path=/trunk/; revision=47617
2013-02-09Make the other plugin makefiles use the new style introduced in the MATEGuy Harris3-33/+40
makefiles. svn path=/trunk/; revision=47579
2012-12-26Fix a bunch of warnings.Guy Harris2-2/+2
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-13General cleanup:Bill Meier9-1887/+2424
- Localize some variables; remove unneeded initializers; - Reformat some hf[] entries; - Whitespace; style; long lines. svn path=/trunk/; revision=46529
2012-12-13Remove some commented out code as per Wido Kelling:Bill Meier2-15/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8002#c9 svn path=/trunk/; revision=46527
2012-12-12General cleanup:Bill Meier4-2631/+2892
- Don't call expert...() under 'if (tree)'; - Make some functions static; - Localize some variables; remove some uneeded initializers; - Reformat some hf[] entries; - Do whitespace fixes (including "4 space tabs"). svn path=/trunk/; revision=46523
2012-12-12From Wido Kelling: [Profinet] Updated disecction regarding the IEC 61158Bill Meier7-264/+1177
(with a few minor fixes by me). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8002 major change: reassembling of PNIO fragments (only works if OpenSafty dissector is disabled) minor changes: improved handling of DFP Frames added / updated MRP Block decoding ARServerBlock ARVendorBlock PDInterfaceDataReal PDInterfaceAdjust PDPortStatistic SubdirFrameData corrected display and subblocks added PDIRGlobalData complete dissection decoding of FrameDataProperties and ARTypes updated to conform the STD removed now usuported RTC2 ranges svn path=/trunk/; revision=46522
2012-11-28Fix [-Wshadow] warning;Bill Meier1-626/+632
Also: - remove some uneeded variable initializers; - reformat some long lines; - do some whitespace and formatting changes to use a consistent style. svn path=/trunk/; revision=46272
2012-11-22Revert http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46140Anders Broman6-1218/+205
looks like the worong variables may be used in the for loops. ../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataAdjust_block': ../../../plugins/profinet/packet-dcerpc-pn-io.c:4420:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable] ../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataReal_block': ../../../plugins/profinet/packet-dcerpc-pn-io.c:4542:5: error: suggest parentheses around assignment used as truth value [-Werror=parentheses] ../../../plugins/profinet/packet-dcerpc-pn-io.c:4491:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable] ../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_PDInterfaceMrpDataCheck_block': ../../../plugins/profinet/packet-dcerpc-pn-io.c:4570:12: warning: variable 'u8MrpInstance' set but not used [-Wunused-but-set-variable] ../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_MrpInstanceDataCheck_block': ../../../plugins/profinet/packet-dcerpc-pn-io.c:5426:160: error: unused parameter 'u16BodyLength' [-Werror=unused-parameter] ../../../plugins/profinet/packet-dcerpc-pn-io.c: In function 'dissect_ARBlockReq_block': ../../../plugins/profinet/packet-dcerpc-pn-io.c:6873:9: error: format '%x' expects a matching 'unsigned int' argument [-Werror=format] ../../../plugins/profinet/packet-dcerpc-pn-io.c:6811:13: warning: variable 'u16ARDevAccess' set but not used [-Wunused-but-set-variable] ../../../plugins/profinet/packet-dcerpc-pn-io.c: At top level: ../../../plugins/profinet/packet-dcerpc-pn-io.c:7628:1: error: 'dissect_IRTFrameBlock_block' defined but not used [-Werror=unused-function] cc1: all warnings being treated as errors svn path=/trunk/; revision=46142