aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-enip.c
AgeCommit message (Collapse)AuthorFilesLines
2012-08-09General cleanup:wmeier1-213/+216
- remove 'if (tree)' around calls to col_...() fcns and to sub-dissectors; - call proto_get_id_by_filter_name() in proto_reg-handoff...() (not init routine); - do some whitespace and formatting changes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44385 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-18Add preference to dissect I/O traffic if ForwardOpen service is not captured.mmann1-5/+340
Add support for DLR object. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43789 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-13tvb_length_remaining() can return -1, so be sure to deal with it if it does.cmaynard1-2/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43704 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-28Update FSF address - part II.darkjames1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43538 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-20Use separate filters for the RTT found on a SACK and the RTT found on amorriss1-388/+914
DATA chunk: having them in both places is helpful when looking at the messages but having them separate is helpful when graphing the RTTs. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43406 f5534014-38df-0310-8fa8-9805f1628bb7
2012-03-07 Fix incorrect packet-details display of certain 1 bit FT_BOOLEAN fields.wmeier1-3/+3
(Use a valid 'parent field width' in the hf[] 'display' field. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41398 f5534014-38df-0310-8fa8-9805f1628bb7
2012-03-06Don't use FT_*INT with true_false strings: the code to generatemorriss1-16/+16
representations of former is expecting value_strings--which are quite different than the latter. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41361 f5534014-38df-0310-8fa8-9805f1628bb7
2012-03-02From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 :morriss1-39/+46
The attached patches fix the following issues: 1. CIP-Motion shouldn't be a heuristic dissector. CIP-Motion packets are determined by specific fields in a CIP ForwardOpen. I ran into situations where CIP-Motion's "vague" heuristics incorrectly dissected packets meant for CIP-Safety. Of course this requires the ForwardOpen to be in the trace, but it is the most deterministic way to have CIP-Motion packets. 2. Minor bugfix to the CIP-Safety dissector. A couple of fields were "missing", causing errant malformed packets. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41283 f5534014-38df-0310-8fa8-9805f1628bb7
2012-02-27From Michael Mann:etxrab1-29/+73
a dissector for the ODVA protocol: CIP Safety. More information about the protocol can be found here: http://www.odva.org/Home/ODVATECHNOLOGIES/CIP/CIPTechnologyOverview/CIPSafety/CIPSafetyOverview/tabid/131/lng/en-US/Default.aspx https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6862 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41201 f5534014-38df-0310-8fa8-9805f1628bb7
2012-01-04Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clangalagoutte1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40374 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-01From Michael Mann:etxrab1-286/+338
ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40059 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-26Removed duplicate enip.connection_transport_data entry.stig1-5/+0
This fixes bug 6490. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39603 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-26From Michael Mann:etxrab1-33/+613
Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39595 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-20Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.wmeier1-1/+1
(Some minor whitespace cleanup). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39488 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-15Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, ↵wmeier1-2/+2
FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39426 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-13From Benjamin Stocks (with some work by Michael Mann): "CIP Motion" dissector;wmeier1-297/+270
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5929 From me: packet-cipmotion.c: FT_BOOLEAN fields with bitmasks need a bit-fieldwidth in the hf[] entry 'display' field; Define attribute_size as guint32 since it has to store guint8*guint16; Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types; Remove trailing whitespace from lines; Other minor cleanup and reformatting. packet-enip.c: Use ENC_NA as encoding arg in proto_tree_add_item() for FT_BYTES field types; git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39396 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵wmeier1-3/+3
reference an hf item (in hf[] with types: FT_NONE FT_BYTES FT_IPV6 FT_IPXNET FT_OID Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39260 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-02OK, those seem to depend on at least some of the CIP changes, so backguy1-546/+79
the ENIP changes out as well. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39232 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-02Fix warnings.tuexen1-25/+25
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39228 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-02From Michael Mann :etxrab1-79/+546
General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39222 f5534014-38df-0310-8fa8-9805f1628bb7
2011-04-25From Joakim Wiberg via ↵morriss1-153/+233
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5801 : The attached patch replaces most of the proto_tree_add_text() with proto_tree_add_item(). That resulted in several new display filters. It also uses the correct defines (ENC_NA, ENC_BIG_ENDIAN and ENC_LITTLE_ENDIAN) instead of TRUE/FALSE in all proto_tree_add_item() calls. Also it prints all out all connected transport data, since this is used by "IENetP Test Tool" as a part of the XML export. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36844 f5534014-38df-0310-8fa8-9805f1628bb7
2010-12-20Rename the routines that handle dissector tables with unsigned integerguy1-6/+6
keys to have _uint in their names, to match the routines that handle dissector tables with string keys. (Using _port can confuse people into thinking they're intended solely for use with TCP/UDP/etc. ports when, in fact, they work better for things such as Ethernet types, where the binding of particular values to particular protocols are a lot stronger.) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35224 f5534014-38df-0310-8fa8-9805f1628bb7
2010-05-13As suggested in ↵morriss1-30/+5
http://www.wireshark.org/lists/wireshark-dev/200809/msg00075.html (as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32790 f5534014-38df-0310-8fa8-9805f1628bb7
2010-04-03Remove unneeded #include <stdio.h>wmeier1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32367 f5534014-38df-0310-8fa8-9805f1628bb7
2009-10-25From Jakub Zawadzki:etxrab1-4/+1
Cleanup dissector code - use proper memory functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30691 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-09Don't guard col_clear with col_checkkrj1-4/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29344 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkkrj1-2/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29341 f5534014-38df-0310-8fa8-9805f1628bb7
2009-08-09Don't guard col_set_str (COL_PROTOCOL) with col_checkkrj1-4/+2
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29340 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-15Indent some comments.stig1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29103 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-10Header field cleanup.stig1-10/+10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29049 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-09From Joakim Wiberg:etxrab1-0/+351
Device Level Ring protocol addition. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3685 With some minor changes (blurb NULL whem text equal). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29044 f5534014-38df-0310-8fa8-9805f1628bb7
2009-07-07From Kovarththanan Rajaratnam:stig1-2/+2
More FT_XXX cleanup. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28971 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-26From Joakim Wiberg via bug 3103:stig1-513/+993
Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28844 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-24More hf_register_info related cleanup.stig1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28834 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-19Revert changes committed by an accident.stig1-990/+513
Will be committed again later. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28779 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-19Moved setting of length2 to make it always set.stig1-513/+990
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28777 f5534014-38df-0310-8fa8-9805f1628bb7
2009-06-18From Kovarththanan Rajaratnam via bug 3548:stig1-3/+3
(1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28770 f5534014-38df-0310-8fa8-9805f1628bb7
2008-12-18Fix various typos and spelling errors (mostly in text strings)wmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27050 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-31Fix some indentation ....wmeier1-161/+161
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26651 f5534014-38df-0310-8fa8-9805f1628bb7
2008-10-23Let the dissectors fill the Protocol and Info columns by calling the even ↵jake1-31/+33
when tree == NULL. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26531 f5534014-38df-0310-8fa8-9805f1628bb7
2008-08-26#include <emem.h> not req'dwmeier1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26091 f5534014-38df-0310-8fa8-9805f1628bb7
2008-08-08Replace custom data presentation with native one.jake1-66/+17
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25965 f5534014-38df-0310-8fa8-9805f1628bb7
2007-12-11Make the EtherNet/IP (Industrial Protocol) I/O dissection a new typesfisher1-2/+12
of dissector that rejects packets it doesn't recognize (on udp port 2222). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23836 f5534014-38df-0310-8fa8-9805f1628bb7
2007-11-08Apply yet another set of the optimization patches:etxrab1-2/+2
When offset parameter is 0 replace tvb_bytes_exist() with the faster tvb_length(). non heuristic dissectors git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23405 f5534014-38df-0310-8fa8-9805f1628bb7
2007-10-23Apply the small performance enhancment patches for:etxrab1-2/+2
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster. Replace - col_append_fstr() with faster col_append_str() - col_add_str() with col_set_str() when it's safe git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23252 f5534014-38df-0310-8fa8-9805f1628bb7
2007-04-23Add some GCC warnings to the standard set, and add some others to theguy1-2/+2
--enable-extra-gcc-checks set. If we turn on -pedantic, try turning on -Wno-long-long as well, so that it's not *so* pedantic that it rejects the 64-bit integral data types that we explicitly require. Constify a bunch of stuff, and make some other changes, to get rid of warnings. Clean up some indentation. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21526 f5534014-38df-0310-8fa8-9805f1628bb7
2006-10-31change the signature for the get_pdu_len() function pointer passed to ↵sahlberg1-1/+1
tcp_dissect_pdus() to also include a packet_info pointer. there are many reasons why some protocols actually need to be able to access the pinfo structure while determining the pdu size git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19751 f5534014-38df-0310-8fa8-9805f1628bb7
2006-05-21change a whole bunch of ethereal into wiresharksahlberg1-3/+3
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18196 f5534014-38df-0310-8fa8-9805f1628bb7
2005-12-20From jaap Keuter:etxrab1-4/+3
Taking a random dissector from the list on the Wiki I picked packet-enip.c. Nothing wrong with this one, I still ememified it. From Bart Braem: packet-mip.c does not have support for all registration denials by the foreign agent, code 77 was left out. The attached patch fixes that. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16868 f5534014-38df-0310-8fa8-9805f1628bb7
2005-10-11remove some redundant strcpy()sahlberg1-5/+5
fix a compiler warning git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16195 f5534014-38df-0310-8fa8-9805f1628bb7
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 06:22:58 +0000