aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/profinet
AgeCommit message (Collapse)AuthorFilesLines
2014-12-26Fix assertion when applying conversation colorPascal Quantin1-16/+16
Packet scoped memory cannot be used here; let's use the pinfo pool Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f Reviewed-on: https://code.wireshark.org/review/6061 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.Michael Mann4-47/+55
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 Reviewed-on: https://code.wireshark.org/review/5934 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-22plugins: Cleanup #includesBill Meier9-21/+6
Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c Mostly: remove '#include <glib/glib.h>' and certain other #includes already included in packet.h Reviewed-on: https://code.wireshark.org/review/5971 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21Replace ether_to_str with either address_to_str or tvb_ether_to_str.Michael Mann1-11/+26
Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260 Reviewed-on: https://code.wireshark.org/review/5933 Petri-Dish: Michael Mann <mmann78@netscape.net> 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>
2014-12-21Have a heur_dissector_list_t be an opaque handle.Guy Harris2-2/+2
This allows dissector lists to be looked up by name, so they can be shared by multiple dissectors. (This means that there's no "udplite" heuristic dissector list, but there shouldn't be one - protocols can run atop UDP or UDPLite equally well, and they share a port namespace and uint dissector table, so they should share a heuristic dissector table as well.) Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7 Reviewed-on: https://code.wireshark.org/review/5936 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Remove profinet_type from packet_info structure.Michael Mann2-35/+43
Profinet I/O and DCOM CBA had completely separate uses for the profinet_type member, so it's okay to separate them with different proto ids tracking the proto_data. Change-Id: I7b9c01b8d4f74d51fe9f9ef2f957479dff0a7157 Reviewed-on: https://code.wireshark.org/review/5852 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-19Use new color_dissector_filters.[ch] to refactor (color) conversation ↵Michael Mann1-1/+1
generation in GTK menus. Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf Reviewed-on: https://code.wireshark.org/review/5828 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>
2014-12-10Refactor "color" conversation filtersMichael Mann1-0/+49
Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list. GUI actually using API will come in a separate commit. Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a Reviewed-on: https://code.wireshark.org/review/5658 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-02Fix instances of duplicate display-filter-names with incompatible types.Bill Meier1-5/+5
Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef Note: Some of the filters, when/if used, could have caused Wireshark crashes. Reviewed-on: https://code.wireshark.org/review/5575 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-01Remove private_data member from packet_info structure.Michael Mann1-1/+0
Dissectors should pass data directly to their subdissectors through the data parameter (of new-style dissectors). This avoids unintentional "trampling" from other dissectors trying to "share" private_data member. Change-Id: I2efef5c8dfeef64588ba3ac6e695b469238c6468 Reviewed-on: https://code.wireshark.org/review/5487 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-24Pass FrameID as data to the heuristic table, rather than use ↵Michael Mann6-44/+24
pinfo->private_data. Change-Id: Idd5818cbb2b1f8628bb29c2c71dfc6d41df89b5d Reviewed-on: https://code.wireshark.org/review/5448 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-09CMake: Bundle our plugins.Gerald Combs1-3/+12
plugins/*/CMakeLists.txt has a lot of repitition. We might want to create a module or include file to simplify things. Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852 Reviewed-on: https://code.wireshark.org/review/4582 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06Adjust some whitespace to match editor modelines.Bill Meier1-5/+5
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3 Reviewed-on: https://code.wireshark.org/review/4489 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06plugins: Add editor modelines; Adjust whitespace as needed.Bill Meier8-0/+103
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088 Reviewed-on: https://code.wireshark.org/review/4488 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19Don't assert that values fit in 32 bits if the NDR64 flag is set.Michael Mann1-3/+10
For now, this just pacifies fuzz-testing. If real world examples have this, there needs to be a drastic overhaul to support fields that could be either 32 or 64-bit values. Bug:9329 Change-Id: I3e28808ca0291868a5f84258b0ee1e2a922703c2 Reviewed-on: https://code.wireshark.org/review/4189 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-31Don't show the echo/python command lines when making plugin.cРоман Донченко1-3/+4
For consistency with epan/dissectors/Makefile.am. Also, remove the "with python" parts, since that's the only option now. Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1 Reviewed-on: https://code.wireshark.org/review/3925 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-24Remove obsolete comments regarding the shell version of make-dissector-regРоман Донченко1-5/+0
Change-Id: I93470e8c6e9afd6c1ebf735eb13141586964be0e Reviewed-on: https://code.wireshark.org/review/3818 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-18Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Add static before function Change-Id: Icb54ccf58e5752892e7217327380a0af7da45647 Reviewed-on: https://code.wireshark.org/review/3690 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-17DCERPC PN IO: Add modelines infoAlexis La Goutte1-0/+13
Change-Id: I124c5d38f8f3b4aee6d5dbee0367555742350e55 Reviewed-on: https://code.wireshark.org/review/3657 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-12Remove make-dissector-reg and require python for autotool builds as wellJoerg Mayer1-12/+4
Change-Id: I6239063a08ba37199a4e95302a3650a80544c750 Reviewed-on: https://code.wireshark.org/review/3562 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-09Now that Python is mandatory on Windows, remove checks for it from nmakefilesРоман Донченко1-12/+1
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-11Strip some trailing whitespace; Fix some indentation; Add editor-modelines ↵Bill Meier1-1/+1
as needed. Change-Id: I943153e28f468070d86535abad7be032e1386118 Reviewed-on: https://code.wireshark.org/review/2994 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-10convert to proto_tree_add_subtree[_format] for plugin dissectorsMichael Mann2-7/+6
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97 Reviewed-on: https://code.wireshark.org/review/2974 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-10Revert "More needed to get rid of "lib" in "libwsutil" on Windows."Guy Harris1-1/+1
This reverts commit 28719a4e4e01b478889dab9611fed517e506360e. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a Reviewed-on: https://code.wireshark.org/review/2972 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09More needed to get rid of "lib" in "libwsutil" on Windows.Guy Harris1-1/+1
Change-Id: Iffc12ce67a8245e96eac3cf253641a15385001a9 Reviewed-on: https://code.wireshark.org/review/2969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06make-dissectors-reg: optimize by factoring out the loopsРоман Донченко2-10/+10
Instead of calling the grep/sed pipelines for each file, build the list of files in the beginning and call each pipeline only once, passing the list to the first grep. This results in a massive speedup in Cygwin; in my test, the time it takes to run make-dissector-reg . dissectors packet-*.c in dissectors/epan is reduced from ~116 to ~3 seconds. I also tried it on NetBSD, where the time do to the same goes from ~6 to ~0.5 seconds. Amend makefile comments to elide mentions of invoking multiple processes per file. Change-Id: Iad441e7d2b6cc3669dada57646e2f8f6b987fd34 Reviewed-on: https://code.wireshark.org/review/2826 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-20Add .rc files to the sources to have them included in the buildJoerg Mayer1-0/+1
Change-Id: I84dda519e617b24d92fcf374670a4a6ee6f488ee Reviewed-on: https://code.wireshark.org/review/2506 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann2-7/+7
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-21Change the signature of dissector_try_heuristic() to return hdtbl_entryAndersBroman2-2/+4
which can be used to call the found heuristic dissector on the next pass. Introduce call_heur_dissector_direct() to be used to call a heuristic dissector which accepted the frame on the first pass. Change-Id: I524edd717b7d92b510bd60acfeea686d5f2b4582 Reviewed-on: https://code.wireshark.org/review/1697 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-15Get rid of some uses of tvb_get_ptr().Guy Harris1-2/+2
Change-Id: I85232f984f273c9a6ceccd12df5b77a4d131596c Reviewed-on: https://code.wireshark.org/review/1648 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-1/+2
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-08I don't see anything here requiring netinet/in.h, so don't include it.Guy Harris1-8/+0
Change-Id: Id024d7e2529a6eb9ca79ce8c3ea674a3c0795b85 Reviewed-on: https://code.wireshark.org/review/1030 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte5-10/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-05Corrected mrp decoding of link up and downWidok3-255/+156
Added DCP decoding of reset to factory removed unused value_strings corrected decoding of PDSubFrameBlock most of the length display added a dec_hex display Signed-off-by: Widok <kellingwido@aol.com> Change-Id: I17b59b45eff37b65047a7a3e5e275f01a37ee616 Reviewed-on: https://code.wireshark.org/review/517 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte11-22/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-25Remove trailing whitespaceBill Meier1-2/+2
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-24Fix -Wunused-const-variable found by ClangAlexis La Goutte1-0/+4
Change-Id: I7fb2e6477cea26a5ee13dcc0610f7522ce211ae2 Reviewed-on: https://code.wireshark.org/review/321 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-19Bug 9721 - profinet write doesn't decode the Profidrive value Type correctWidok1-46/+155
removed win-setup.sh.bak Signed-off-by: Widok <kellingwido@aol.com> Change-Id: I4ec65ef10ca794cd5b43fa66502edd4533c356d1 Reviewed-on: https://code.wireshark.org/review/198 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-13dissect_CBA_Connection_Data() isn't used outside packet-dcom-cba-acco.c,Guy Harris2-8/+1
so make it static - and get rid of the #if 0'ed out declaration in packet-dcom-cba-acco.h. svn path=/trunk/; revision=54735
2014-01-13Move dissect_pn_uint16_ret_item() to packet-pn.c, to be with its siblingGuy Harris3-22/+22
dissect_pn_uint16(). Declare it in packet-pn.h. svn path=/trunk/; revision=54733
2014-01-01Fix [-Wmissing-prototypes]Anders Broman8-3/+20
svn path=/trunk/; revision=54528
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 16:58:20 +0000