aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/ethercat
AgeCommit message (Collapse)AuthorFilesLines
2014-12-21Have a heur_dissector_list_t be an opaque handle.Guy Harris1-1/+1
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-13plugins: replace ENC_NA by ENC_..._ENDIAN when fetching integral typesBill Meier1-1/+1
Change-Id: I3958bbd0eadd4472a003ea272e596026ad8731d1 Reviewed-on: https://code.wireshark.org/review/5753 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-17Eliminate proto_tree_add_textMichael Mann1-207/+101
Also some other cleanup to simplify dissector logic. Change-Id: Ia84300b7eadafe292361014dd0e565ec250cae44 Reviewed-on: https://code.wireshark.org/review/5311 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-10-14Always put editor-modelines at the end of the file ...Bill Meier1-3/+4
... to ensure that there are no potential issues with respect to editors limiting the number of lines scanned at the end of the file when checking for editor modelines. Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4 Reviewed-on: https://code.wireshark.org/review/4688 Reviewed-by: Bill Meier <wmeier@newsguy.com>
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-1/+1
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 Meier7-1753/+1843
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088 Reviewed-on: https://code.wireshark.org/review/4488 Reviewed-by: Bill Meier <wmeier@newsguy.com>
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-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-10convert to proto_tree_add_subtree[_format] for plugin dissectorsMichael Mann2-9/+5
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 Mann3-5/+5
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_entryAndersBroman1-3/+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-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-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-04Remove all $Id$ from top of fileAlexis La Goutte13-26/+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 Meier4-13/+13
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>
2013-12-20#if 0 a group of unused #defines;Bill Meier1-8/+23
Remove some trailing whitespace; Add editor modelines. svn path=/trunk/; revision=54307
2013-12-20fixMartin Kaiser1-0/+1
CC packet-ecatmb.lo packet-ecatmb.c: In function 'dissect_ecat_mailbox': packet-ecatmb.c:877:64: error: 'info.anSdoInfoUnion.Entry.ValueInfo' may be used uninitialized in this function [-Werror=uninitialized] packet-ecatmb.c:796:38: note: 'info.anSdoInfoUnion.Entry.ValueInfo' was declared here packet-ecatmb.c:884:34: error: 'info.anSdoInfoUnion.Entry.Res.BitLen' may be used uninitialized in this function [-Werror=uninitialized] packet-ecatmb.c:796:38: note: 'info.anSdoInfoUnion.Entry.Res.BitLen' was declared here svn path=/trunk/; revision=54286
2013-12-20Fix [-Wmissing-prototypes]Anders Broman2-6/+12
svn path=/trunk/; revision=54280
2013-11-21Create separate dissector function for TCP functionality so ↵Michael Mann1-12/+17
packet_info->ethertype doesn't need to be used. svn path=/trunk/; revision=53478
2013-11-19Fix [-Wmissing-prototypes]Anders Broman5-2/+16
svn path=/trunk/; revision=53425
2013-11-05Remove setting of pinfo->private_data to ETHERCAT_MBOX_HEADER structure as ↵Michael Mann1-1/+0
it's not used anywhere in the Wireshark source. If it's used by a third-party plugin, please submit a patch that passes the ETHERCAT_MBOX_HEADER structure through the data parameter of the "new" style dissector function. svn path=/trunk/; revision=53094
2013-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier1-4/+1
- 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-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-08-15As suggested by Volcke Mario, fixingEvan Huus1-1/+0
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9036 Don't change the length *and* the offset when adjusting for the ethercat header, just the offset is enough (the length is then right). svn path=/trunk/; revision=51360
2013-07-22Revert removed line in r50774, we can update pinfo->rel_ts not sure if it ↵Jakub Zawadzki1-0/+1
makes sense, but why not? svn path=/trunk/; revision=50795
2013-07-21Update plugins/ with recent change.Jakub Zawadzki1-1/+0
svn path=/trunk/; revision=50774
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-06-25Link this plugin with libwsutil too (in order to pick up time symbols).Jeff Morriss1-1/+1
svn path=/trunk/; revision=50155
2013-03-29Rename value string (and similar) functions to use a consistent pattern. ThisEvan Huus1-1/+1
was done using textual search+replace, not anything syntax-aware, so presumably it got most comments as well (except where there were typos). Use a consistent coding style, and make proper use of the WS_DLL_* defines. Group the functions appropriately in the header. I ended up getting rid of most of the explanatory comments since many of them duplicated what was in the value_string.c file (and were out of sync with the recent updates I made to those in r48633). Presumably most of the comments should be in the .h file not the .c file, but there's enough churn ahead that it's not worth fixing yet. Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467 svn path=/trunk/; revision=48634
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-09From Thomas Wiens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8455Evan Huus1-1/+1
Don't add an extra 16 to offset, we've been updating it as we go. Fixes cases where valid AMS packets were marked as malformed. svn path=/trunk/; revision=48215
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-10Comment out numerous unused hf_.... instances found by checkhf.Bill Meier5-16/+34
svn path=/trunk/; revision=47617
2013-02-09Make the other plugin makefiles use the new style introduced in the MATEGuy Harris3-26/+38
makefiles. svn path=/trunk/; revision=47579
2012-12-26Fix a bunch of warnings.Guy Harris8-150/+150
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-09-23Store pointers to previously displayed and captured packet, not nstime_t deltas.Jakub Zawadzki1-2/+0
This commit reduces size (from 144B to 128B on AMD64) of frame_data structure. Part of bug 5821: Reduce per-packet memory requirements. svn path=/trunk/; revision=45071
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss7-14/+0
svn path=/trunk/; revision=45015
2012-09-11Add data parameter to dissector_try_heuristicJakub Zawadzki1-3/+3
svn path=/trunk/; revision=44871
2012-09-10Initial commit to support yet another method of passing data between dissectors.Jakub Zawadzki2-2/+2
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-06-28Update FSF address - part II.Jakub Zawadzki1-4/+4
svn path=/trunk/; revision=43538
2012-06-28Update Free Software Foundation address.Jakub Zawadzki16-16/+16
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-07Attempt to fix display of "eoe macfilter header".Bill Meier1-7/+19
Among other things: fix incorrect 'display' value in several hf[] entries. (See XXX coments in source for further details). Attempt to fix use of incorrect value in hf[] entry 'display' fields svn path=/trunk/; revision=43149
2012-06-01Set Makefile.common as a plugin.c dependency so plugin.c is rebuilt if ↵Bill Meier1-1/+1
Makefile.common is changed svn path=/trunk/; revision=42972