osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/epan/dissectors/packet-cip.c

8230 lines
387 KiB
C
Raw Normal View History

From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* packet-cip.c
* Routines for Common Industrial Protocol (CIP) dissection
* CIP Home: www.odva.org
*
* Copyright 2004
* Magnus Hansson <mah@hms.se>
* Joakim Wiberg <jow@hms.se>
*
From Ryan Wamsley: Add Connection Configuration Object support to EtherNet/IP dissector svn path=/trunk/; revision=20897
2007-02-22 03:21:26 +00:00
* Added support for Connection Configuration Object
* ryan wamsley * Copyright 2007
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
*
* Object dependend services based on IOI
* Jan Bartels, Siempelkamp Maschinen- und Anlagenbau GmbH & Co. KG
* Copyright 2007
From Ryan Wamsley: Add Connection Configuration Object support to EtherNet/IP dissector svn path=/trunk/; revision=20897
2007-02-22 03:21:26 +00:00
*
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
* Improved support for CoCo, CM, MB objects
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
* Heuristic object support for common services
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
* Michael Mann * Copyright 2011
*
change a whole bunch of ethereal into wireshark svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
Update FSF address - part II. svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
*/
We always HAVE_CONFIG_H so don't bother checking whether we have it or not. svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
#include "config.h"
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
#include <epan/packet.h>
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
#include <epan/expert.h>
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
#include <epan/prefs.h>
Move the proto data stuff out of frame_data.[ch]. 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-25 01:10:20 +00:00
#include <epan/proto_data.h>
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
#include <wmem/wmem_list.h>
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
#include "packet-cip.h"
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
#include "packet-cipsafety.h"
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
#include "packet-mbtcp.h"
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
static void dissect_cip_data(proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info *pinfo,
cip_req_info_t *preq_info, proto_item* msp_item, gboolean is_msp_item);
static int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int offset, int pathpos, proto_tree *path_tree, proto_item *epath_item,
gboolean generate, gboolean packed, cip_simple_request_info_t* req_data, cip_safety_epath_info_t* safety, int display_type, proto_item *msp_item,
gboolean is_msp_item);
[-Wmissing-prototypes] Use explicit casts. svn path=/trunk/; revision=48313
2013-03-15 06:26:47 +00:00
void proto_register_cip(void);
void proto_reg_handoff_cip(void);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
typedef struct mr_mult_req_info {
guint8 service;
int num_services;
cip_req_info_t *requests;
} mr_mult_req_info_t;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
Define some fcns & vars as static; Minor whitespace and comments cleanup. svn path=/trunk/; revision=34477
2010-10-11 19:00:55 +00:00
static dissector_handle_t cip_class_generic_handle;
static dissector_handle_t cip_class_cm_handle;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
static dissector_handle_t modbus_handle;
Define some fcns & vars as static; Minor whitespace and comments cleanup. svn path=/trunk/; revision=34477
2010-10-11 19:00:55 +00:00
static dissector_handle_t cip_class_cco_handle;
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
static heur_dissector_list_t heur_subdissector_service;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
static gboolean cip_enhanced_info_column = TRUE;
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Initialize the protocol and registered fields */
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int proto_cip = -1;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static int proto_cip_class_generic = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int proto_cip_class_cm = -1;
static int proto_cip_class_mb = -1;
static int proto_cip_class_cco = -1;
static int proto_enip = -1;
static int proto_modbus = -1;
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
int hf_attr_class_revision = -1;
int hf_attr_class_max_instance = -1;
int hf_attr_class_num_instance = -1;
int hf_attr_class_opt_attr_num = -1;
int hf_attr_class_attr_num = -1;
int hf_attr_class_opt_service_num = -1;
int hf_attr_class_service_code = -1;
int hf_attr_class_num_class_attr = -1;
int hf_attr_class_num_inst_attr = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_data = -1;
static int hf_cip_service = -1;
static int hf_cip_service_code = -1;
static int hf_cip_reqrsp = -1;
static int hf_cip_epath = -1;
static int hf_cip_genstat = -1;
static int hf_cip_addstat_size = -1;
static int hf_cip_add_stat = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static int hf_cip_request_path_size = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_cm_sc = -1;
static int hf_cip_cm_genstat = -1;
static int hf_cip_cm_addstat_size = -1;
static int hf_cip_cm_add_status = -1;
static int hf_cip_cm_ext_status = -1;
static int hf_cip_cm_priority = -1;
static int hf_cip_cm_tick_time = -1;
static int hf_cip_cm_timeout_tick = -1;
static int hf_cip_cm_timeout = -1;
static int hf_cip_cm_ot_connid = -1;
static int hf_cip_cm_to_connid = -1;
static int hf_cip_cm_conn_serial_num = -1;
static int hf_cip_cm_orig_serial_num = -1;
static int hf_cip_cm_vendor = -1;
static int hf_cip_cm_timeout_multiplier = -1;
static int hf_cip_cm_ot_rpi = -1;
static int hf_cip_cm_ot_net_params32 = -1;
static int hf_cip_cm_ot_net_params16 = -1;
static int hf_cip_cm_to_rpi = -1;
static int hf_cip_cm_to_net_params32 = -1;
static int hf_cip_cm_to_net_params16 = -1;
static int hf_cip_cm_transport_type_trigger = -1;
static int hf_cip_cm_conn_path_size = -1;
static int hf_cip_cm_ot_api = -1;
static int hf_cip_cm_to_api = -1;
static int hf_cip_cm_app_reply_size = -1;
static int hf_cip_cm_app_reply_data = -1;
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
static int hf_cip_cm_consumer_number = -1;
static int hf_cip_cm_targ_vendor_id = -1;
static int hf_cip_cm_targ_dev_serial_num = -1;
static int hf_cip_cm_targ_conn_serial_num = -1;
static int hf_cip_cm_initial_timestamp = -1;
static int hf_cip_cm_initial_rollover = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_cm_remain_path_size = -1;
static int hf_cip_cm_msg_req_size = -1;
static int hf_cip_cm_route_path_size = -1;
static int hf_cip_cm_fwo_con_size = -1;
static int hf_cip_cm_lfwo_con_size = -1;
static int hf_cip_cm_fwo_fixed_var = -1;
static int hf_cip_cm_lfwo_fixed_var = -1;
static int hf_cip_cm_fwo_prio = -1;
static int hf_cip_cm_lfwo_prio = -1;
static int hf_cip_cm_fwo_typ = -1;
static int hf_cip_cm_lfwo_typ = -1;
static int hf_cip_cm_fwo_own = -1;
static int hf_cip_cm_lfwo_own = -1;
static int hf_cip_cm_fwo_dir = -1;
static int hf_cip_cm_fwo_trigg = -1;
static int hf_cip_cm_fwo_class = -1;
static int hf_cip_cm_gco_conn = -1;
static int hf_cip_cm_gco_coo_conn = -1;
static int hf_cip_cm_gco_roo_conn = -1;
static int hf_cip_cm_gco_last_action = -1;
static int hf_cip_cm_ext112_ot_rpi_type = -1;
static int hf_cip_cm_ext112_to_rpi_type = -1;
static int hf_cip_cm_ext112_ot_rpi = -1;
static int hf_cip_cm_ext112_to_rpi = -1;
static int hf_cip_cm_ext126_size = -1;
static int hf_cip_cm_ext127_size = -1;
static int hf_cip_cm_ext128_size = -1;
static int hf_cip_mb_sc = -1;
static int hf_cip_mb_read_coils_start_addr = -1;
static int hf_cip_mb_read_coils_num_coils = -1;
static int hf_cip_mb_read_coils_data = -1;
static int hf_cip_mb_read_discrete_inputs_start_addr = -1;
static int hf_cip_mb_read_discrete_inputs_num_inputs = -1;
static int hf_cip_mb_read_discrete_inputs_data = -1;
static int hf_cip_mb_read_holding_register_start_addr = -1;
static int hf_cip_mb_read_holding_register_num_registers = -1;
static int hf_cip_mb_read_holding_register_data = -1;
static int hf_cip_mb_read_input_register_start_addr = -1;
static int hf_cip_mb_read_input_register_num_registers = -1;
static int hf_cip_mb_read_input_register_data = -1;
static int hf_cip_mb_write_coils_start_addr = -1;
static int hf_cip_mb_write_coils_outputs_forced = -1;
static int hf_cip_mb_write_coils_num_coils = -1;
static int hf_cip_mb_write_coils_data = -1;
static int hf_cip_mb_write_registers_start_addr = -1;
static int hf_cip_mb_write_registers_outputs_forced = -1;
static int hf_cip_mb_write_registers_num_registers = -1;
static int hf_cip_mb_write_registers_data = -1;
static int hf_cip_mb_data = -1;
static int hf_cip_cco_con_type = -1;
static int hf_cip_cco_ot_rtf = -1;
static int hf_cip_cco_to_rtf = -1;
static int hf_cip_cco_sc = -1;
static int hf_cip_cco_format_number = -1;
static int hf_cip_cco_edit_signature = -1;
static int hf_cip_cco_con_flags = -1;
static int hf_cip_cco_tdi_vendor = -1;
static int hf_cip_cco_tdi_devtype = -1;
static int hf_cip_cco_tdi_prodcode = -1;
static int hf_cip_cco_tdi_compatibility = -1;
static int hf_cip_cco_tdi_comp_bit = -1;
static int hf_cip_cco_tdi_majorrev = -1;
static int hf_cip_cco_tdi_minorrev = -1;
static int hf_cip_cco_pdi_vendor = -1;
static int hf_cip_cco_pdi_devtype = -1;
static int hf_cip_cco_pdi_prodcode = -1;
static int hf_cip_cco_pdi_compatibility = -1;
static int hf_cip_cco_pdi_comp_bit = -1;
static int hf_cip_cco_pdi_majorrev = -1;
static int hf_cip_cco_pdi_minorrev = -1;
static int hf_cip_cco_cs_data_index = -1;
static int hf_cip_cco_ot_rpi = -1;
static int hf_cip_cco_to_rpi = -1;
static int hf_cip_cco_ot_net_param16 = -1;
static int hf_cip_cco_to_net_param16 = -1;
static int hf_cip_cco_fwo_own = -1;
static int hf_cip_cco_fwo_typ = -1;
static int hf_cip_cco_fwo_prio = -1;
static int hf_cip_cco_fwo_fixed_var = -1;
static int hf_cip_cco_fwo_con_size = -1;
static int hf_cip_cco_ot_net_param32 = -1;
static int hf_cip_cco_to_net_param32 = -1;
static int hf_cip_cco_lfwo_own = -1;
static int hf_cip_cco_lfwo_typ = -1;
static int hf_cip_cco_lfwo_prio = -1;
static int hf_cip_cco_lfwo_fixed_var = -1;
static int hf_cip_cco_lfwo_con_size = -1;
static int hf_cip_cco_conn_path_size = -1;
static int hf_cip_cco_proxy_config_size = -1;
static int hf_cip_cco_target_config_size = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static int hf_cip_cco_iomap_format_number = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_cco_iomap_size = -1;
static int hf_cip_cco_connection_disable = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static int hf_cip_cco_net_conn_param_attr = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_cco_timeout_multiplier = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static int hf_cip_cco_transport_type_trigger = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_cco_fwo_dir = -1;
static int hf_cip_cco_fwo_trigger = -1;
static int hf_cip_cco_fwo_class = -1;
static int hf_cip_cco_proxy_config_data = -1;
static int hf_cip_cco_target_config_data = -1;
static int hf_cip_cco_iomap_attribute = -1;
static int hf_cip_cco_safety = -1;
static int hf_cip_cco_change_type = -1;
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
static int hf_cip_cco_connection_name = -1;
static int hf_cip_cco_ext_status = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_path_segment = -1;
static int hf_cip_path_segment_type = -1;
static int hf_cip_port_ex_link_addr = -1;
static int hf_cip_port = -1;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static int hf_cip_port_extended = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_link_address_size = -1;
static int hf_cip_link_address_byte = -1;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
static int hf_cip_link_address_string = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_logical_seg_type = -1;
static int hf_cip_logical_seg_format = -1;
static int hf_cip_class8 = -1;
static int hf_cip_class16 = -1;
static int hf_cip_class32 = -1;
static int hf_cip_instance8 = -1;
static int hf_cip_instance16 = -1;
static int hf_cip_instance32 = -1;
static int hf_cip_member8 = -1;
static int hf_cip_member16 = -1;
static int hf_cip_member32 = -1;
static int hf_cip_attribute8 = -1;
static int hf_cip_attribute16 = -1;
static int hf_cip_attribute32 = -1;
static int hf_cip_conpoint8 = -1;
static int hf_cip_conpoint16 = -1;
static int hf_cip_conpoint32 = -1;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static int hf_cip_serviceid8 = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_ekey_format = -1;
static int hf_cip_ekey_vendor = -1;
static int hf_cip_ekey_devtype = -1;
static int hf_cip_ekey_prodcode = -1;
static int hf_cip_ekey_compatibility = -1;
static int hf_cip_ekey_comp_bit = -1;
static int hf_cip_ekey_majorrev = -1;
static int hf_cip_ekey_minorrev = -1;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static int hf_cip_ext_logical8 = -1;
static int hf_cip_ext_logical16 = -1;
static int hf_cip_ext_logical32 = -1;
static int hf_cip_ext_logical_type = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_data_seg_type = -1;
static int hf_cip_data_seg_size = -1;
static int hf_cip_data_seg_item = -1;
static int hf_cip_symbol = -1;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static int hf_cip_symbol_size = -1;
static int hf_cip_symbol_ascii = -1;
static int hf_cip_symbol_extended_format = -1;
static int hf_cip_symbol_numeric_format = -1;
static int hf_cip_symbol_double_size = -1;
static int hf_cip_symbol_triple_size = -1;
static int hf_cip_numeric_usint = -1;
static int hf_cip_numeric_uint = -1;
static int hf_cip_numeric_udint = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_network_seg_type = -1;
static int hf_cip_seg_schedule = -1;
static int hf_cip_seg_fixed_tag = -1;
static int hf_cip_seg_prod_inhibit_time = -1;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static int hf_cip_seg_prod_inhibit_time_us = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_seg_network_size = -1;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static int hf_cip_seg_network_subtype = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_seg_safety_format = -1;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
static int hf_cip_seg_safety_reserved = -1;
static int hf_cip_seg_safety_configuration_crc = -1;
static int hf_cip_seg_safety_configuration_timestamp = -1;
static int hf_cip_seg_safety_configuration_date = -1;
static int hf_cip_seg_safety_configuration_time = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_seg_safety_time_correction_epi = -1;
static int hf_cip_seg_safety_time_correction_net_params = -1;
static int hf_cip_seg_safety_time_correction_own = -1;
static int hf_cip_seg_safety_time_correction_typ = -1;
static int hf_cip_seg_safety_time_correction_prio = -1;
static int hf_cip_seg_safety_time_correction_fixed_var = -1;
static int hf_cip_seg_safety_time_correction_con_size = -1;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
static int hf_cip_seg_safety_tunid = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_seg_safety_tunid_ssn_timestamp = -1;
static int hf_cip_seg_safety_tunid_ssn_date = -1;
static int hf_cip_seg_safety_tunid_ssn_time = -1;
static int hf_cip_seg_safety_tunid_macid = -1;
static int hf_cip_seg_safety_ounid = -1;
static int hf_cip_seg_safety_ounid_ssn_timestamp = -1;
static int hf_cip_seg_safety_ounid_ssn_date = -1;
static int hf_cip_seg_safety_ounid_ssn_time = -1;
static int hf_cip_seg_safety_ounid_macid = -1;
static int hf_cip_seg_safety_ping_eri_multiplier = -1;
static int hf_cip_seg_safety_time_coord_msg_min_multiplier = -1;
static int hf_cip_seg_safety_network_time_expected_multiplier = -1;
static int hf_cip_seg_safety_timeout_multiplier = -1;
static int hf_cip_seg_safety_max_consumer_number = -1;
static int hf_cip_seg_safety_conn_param_crc = -1;
static int hf_cip_seg_safety_time_correction_conn_id = -1;
static int hf_cip_seg_safety_max_fault_number = -1;
static int hf_cip_seg_safety_init_timestamp = -1;
static int hf_cip_seg_safety_init_rollover = -1;
static int hf_cip_seg_safety_data = -1;
static int hf_cip_class_max_inst32 = -1;
static int hf_cip_class_num_inst32 = -1;
static int hf_cip_reserved8 = -1;
Comment out unused hf[] entries & etc. (found by checkhf) svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
/* static int hf_cip_reserved16 = -1; */
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_cip_reserved24 = -1;
static int hf_cip_pad8 = -1;
static int hf_cip_sc_get_attr_list_attr_count = -1;
static int hf_cip_sc_get_attr_list_attr_status = -1;
static int hf_cip_sc_get_attr_list_attr_data = -1;
static int hf_cip_sc_set_attr_list_attr_count = -1;
static int hf_cip_sc_set_attr_list_attr_status = -1;
static int hf_cip_sc_set_attr_list_attr_data = -1;
static int hf_cip_sc_reset_param = -1;
static int hf_cip_sc_get_attribute_all_data = -1;
static int hf_cip_sc_set_attribute_all_data = -1;
static int hf_cip_sc_reset_data = -1;
static int hf_cip_sc_start_data = -1;
static int hf_cip_sc_stop_data = -1;
static int hf_cip_sc_create_instance = -1;
static int hf_cip_sc_create_data = -1;
static int hf_cip_sc_delete_data = -1;
static int hf_cip_sc_mult_serv_pack_num_services = -1;
static int hf_cip_sc_mult_serv_pack_offset = -1;
static int hf_cip_sc_apply_attributes_data = -1;
static int hf_cip_sc_set_attr_single_data = -1;
static int hf_cip_sc_get_attr_single_data = -1;
static int hf_cip_find_next_object_max_instance = -1;
static int hf_cip_find_next_object_num_instances = -1;
static int hf_cip_find_next_object_instance_item = -1;
static int hf_cip_sc_restore_data = -1;
static int hf_cip_sc_save_data = -1;
static int hf_cip_sc_noop_data = -1;
static int hf_cip_sc_get_member_data = -1;
static int hf_cip_sc_set_member_data = -1;
static int hf_cip_sc_insert_member_data = -1;
static int hf_cip_sc_remove_member_data = -1;
static int hf_cip_sc_group_sync_is_sync = -1;
static int hf_cip_sc_group_sync_data = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Parsed Attributes */
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_id_vendor_id = -1;
static int hf_id_device_type = -1;
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
static int hf_id_product_code = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_id_major_rev = -1;
static int hf_id_minor_rev = -1;
static int hf_id_status = -1;
static int hf_id_serial_number = -1;
static int hf_id_product_name = -1;
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static int hf_id_state = -1;
static int hf_id_config_value = -1;
static int hf_id_heartbeat = -1;
static int hf_id_status_owned = -1;
static int hf_id_status_conf = -1;
static int hf_id_status_extended1 = -1;
static int hf_id_status_minor_fault_rec = -1;
static int hf_id_status_minor_fault_unrec = -1;
static int hf_id_status_major_fault_rec = -1;
static int hf_id_status_major_fault_unrec = -1;
static int hf_id_status_extended2 = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static int hf_msg_rout_num_classes = -1;
static int hf_msg_rout_classes = -1;
static int hf_msg_rout_num_available = -1;
static int hf_msg_rout_num_active = -1;
static int hf_msg_rout_active_connections = -1;
static int hf_conn_mgr_open_requests = -1;
static int hf_conn_mgr_open_format_rejects = -1;
static int hf_conn_mgr_open_resource_rejects = -1;
static int hf_conn_mgr_other_open_rejects = -1;
static int hf_conn_mgr_close_requests = -1;
static int hf_conn_close_format_requests = -1;
static int hf_conn_mgr_close_other_requests = -1;
static int hf_conn_mgr_conn_timouts = -1;
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
static int hf_conn_mgr_num_conn_entries = -1;
static int hf_conn_mgr_num_conn_entries_bytes = -1;
static int hf_conn_mgr_conn_open_bits = -1;
static int hf_conn_mgr_cpu_utilization = -1;
static int hf_conn_mgr_max_buff_size = -1;
static int hf_conn_mgr_buff_size_remaining = -1;
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
static int hf_stringi_number_char = -1;
static int hf_stringi_language_char = -1;
static int hf_stringi_char_string_struct = -1;
static int hf_stringi_char_set = -1;
static int hf_stringi_international_string = -1;
static int hf_file_filename = -1;
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
static int hf_time_sync_ptp_enable = -1;
static int hf_time_sync_is_synchronized = -1;
static int hf_time_sync_sys_time_micro = -1;
static int hf_time_sync_sys_time_nano = -1;
static int hf_time_sync_offset_from_master = -1;
static int hf_time_sync_max_offset_from_master = -1;
static int hf_time_sync_mean_path_delay_to_master = -1;
static int hf_time_sync_gm_clock_clock_id = -1;
static int hf_time_sync_gm_clock_clock_class = -1;
static int hf_time_sync_gm_clock_time_accuracy = -1;
static int hf_time_sync_gm_clock_offset_scaled_log_variance = -1;
static int hf_time_sync_gm_clock_current_utc_offset = -1;
static int hf_time_sync_gm_clock_time_property_flags = -1;
static int hf_time_sync_gm_clock_time_property_flags_leap61 = -1;
static int hf_time_sync_gm_clock_time_property_flags_leap59 = -1;
static int hf_time_sync_gm_clock_time_property_flags_current_utc_valid = -1;
static int hf_time_sync_gm_clock_time_property_flags_ptp_timescale = -1;
static int hf_time_sync_gm_clock_time_property_flags_time_traceable = -1;
static int hf_time_sync_gm_clock_time_property_flags_freq_traceable = -1;
static int hf_time_sync_gm_clock_time_source = -1;
static int hf_time_sync_gm_clock_priority1 = -1;
static int hf_time_sync_gm_clock_priority2 = -1;
static int hf_time_sync_parent_clock_clock_id = -1;
static int hf_time_sync_parent_clock_port_number = -1;
static int hf_time_sync_parent_clock_observed_offset_scaled_log_variance = -1;
static int hf_time_sync_parent_clock_observed_phase_change_rate = -1;
static int hf_time_sync_local_clock_clock_id = -1;
static int hf_time_sync_local_clock_clock_class = -1;
static int hf_time_sync_local_clock_time_accuracy = -1;
static int hf_time_sync_local_clock_offset_scaled_log_variance = -1;
static int hf_time_sync_local_clock_current_utc_offset = -1;
static int hf_time_sync_local_clock_time_property_flags = -1;
static int hf_time_sync_local_clock_time_property_flags_leap61 = -1;
static int hf_time_sync_local_clock_time_property_flags_leap59 = -1;
static int hf_time_sync_local_clock_time_property_flags_current_utc_valid = -1;
static int hf_time_sync_local_clock_time_property_flags_ptp_timescale = -1;
static int hf_time_sync_local_clock_time_property_flags_time_traceable = -1;
static int hf_time_sync_local_clock_time_property_flags_freq_traceable = -1;
static int hf_time_sync_local_clock_time_source = -1;
static int hf_time_sync_num_ports = -1;
static int hf_time_sync_port_state_info_num_ports = -1;
static int hf_time_sync_port_state_info_port_num = -1;
static int hf_time_sync_port_state_info_port_state = -1;
static int hf_time_sync_port_enable_cfg_num_ports = -1;
static int hf_time_sync_port_enable_cfg_port_num = -1;
static int hf_time_sync_port_enable_cfg_port_enable = -1;
static int hf_time_sync_port_log_announce_num_ports = -1;
static int hf_time_sync_port_log_announce_port_num = -1;
static int hf_time_sync_port_log_announce_interval = -1;
static int hf_time_sync_port_log_sync_num_ports = -1;
static int hf_time_sync_port_log_sync_port_num = -1;
static int hf_time_sync_port_log_sync_port_log_sync_interval = -1;
static int hf_time_sync_priority1 = -1;
static int hf_time_sync_priority2 = -1;
static int hf_time_sync_domain_number = -1;
static int hf_time_sync_clock_type = -1;
static int hf_time_sync_clock_type_ordinary = -1;
static int hf_time_sync_clock_type_boundary = -1;
static int hf_time_sync_clock_type_end_to_end = -1;
static int hf_time_sync_clock_type_management = -1;
static int hf_time_sync_clock_type_slave_only = -1;
static int hf_time_sync_manufacture_id_oui = -1;
static int hf_time_sync_manufacture_id_reserved = -1;
static int hf_time_sync_prod_desc_size = -1;
static int hf_time_sync_prod_desc_str = -1;
static int hf_time_sync_revision_data_size = -1;
static int hf_time_sync_revision_data_str = -1;
static int hf_time_sync_user_desc_size = -1;
static int hf_time_sync_user_desc_str = -1;
static int hf_time_sync_port_profile_id_info_num_ports = -1;
static int hf_time_sync_port_profile_id_info_port_num = -1;
static int hf_time_sync_port_profile_id_info_profile_id = -1;
static int hf_time_sync_port_phys_addr_info_num_ports = -1;
static int hf_time_sync_port_phys_addr_info_port_num = -1;
static int hf_time_sync_port_phys_addr_info_phys_proto = -1;
static int hf_time_sync_port_phys_addr_info_addr_size = -1;
Comment out unused hf[] entries & etc. (found by checkhf) svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
/* static int hf_time_sync_port_phys_addr_info_phys_addr = -1; */
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
static int hf_time_sync_port_proto_addr_info_num_ports = -1;
static int hf_time_sync_port_proto_addr_info_port_num = -1;
static int hf_time_sync_port_proto_addr_info_network_proto = -1;
static int hf_time_sync_port_proto_addr_info_addr_size = -1;
static int hf_time_sync_port_proto_addr_info_port_proto_addr = -1;
static int hf_time_sync_steps_removed = -1;
static int hf_time_sync_sys_time_and_offset_time = -1;
static int hf_time_sync_sys_time_and_offset_offset = -1;
Add CIP Security objects These objects are defined in Volume 8, but it doesn't make sense to create a new dissector file for them, so just distribute them where it makes the most sense in the existing CIP dissectors. Also do some conversions to proto_tree_add_bitmask while in the neighborhood. Add support for EtherNet/IP over DTLS/TLS. Change-Id: I4e658e8871eebb222816229de7594ff766264308 Reviewed-on: https://code.wireshark.org/review/13710 Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-28 21:34:14 +00:00
static int hf_cip_security_state = -1;
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static int hf_port_entry_port = -1;
static int hf_port_type = -1;
static int hf_port_number = -1;
static int hf_port_min_node_num = -1;
static int hf_port_max_node_num = -1;
static int hf_port_name = -1;
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
static int hf_conn_path_class = -1;
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static int hf_path_len_usint = -1;
static int hf_path_len_uint = -1;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Initialize the subtree pointers */
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cip = -1;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static gint ett_cip_class_generic = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cip_class_cm = -1;
static gint ett_cip_class_mb = -1;
static gint ett_cip_class_cco = -1;
static gint ett_path = -1;
static gint ett_path_seg = -1;
static gint ett_ekey_path = -1;
static gint ett_mcsc = -1;
static gint ett_cia_path = -1;
static gint ett_data_seg = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static gint ett_data_seg_data = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_port_path = -1;
static gint ett_network_seg = -1;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
static gint ett_network_seg_safety = -1;
static gint ett_network_seg_safety_time_correction_net_params = -1;
static gint ett_cip_seg_safety_tunid = -1;
static gint ett_cip_seg_safety_tunid_ssn = -1;
static gint ett_cip_seg_safety_ounid = -1;
static gint ett_cip_seg_safety_ounid_ssn = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_rrsc = -1;
static gint ett_status_item = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static gint ett_add_status_item = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cmd_data = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
static gint ett_cip_get_attributes_all_item = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cip_get_attribute_list = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static gint ett_cip_get_attribute_list_item = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cip_set_attribute_list = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static gint ett_cip_set_attribute_list_item = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cip_mult_service_packet = -1;
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
static gint ett_cip_msp_offset = -1;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cm_rrsc = -1;
static gint ett_cm_ncp = -1;
static gint ett_cm_mes_req = -1;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static gint ett_cm_cmd_data = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cm_ttt = -1;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static gint ett_cm_add_status_item = -1;
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
static gint ett_cip_cm_pid = -1;
static gint ett_cip_cm_safety = -1;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_mb_rrsc = -1;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
static gint ett_mb_cmd_data = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cco_iomap = -1;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
static gint ett_cco_con_status = -1;
static gint ett_cco_con_flag = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cco_tdi = -1;
static gint ett_cco_pdi = -1;
static gint ett_cco_ncp = -1;
static gint ett_cco_rrsc = -1;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static gint ett_cco_cmd_data = -1;
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
static gint ett_cco_ttt = -1;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
static gint ett_time_sync_gm_clock_flags = -1;
static gint ett_time_sync_local_clock_flags = -1;
static gint ett_time_sync_port_state_info = -1;
static gint ett_time_sync_port_enable_cfg = -1;
static gint ett_time_sync_port_log_announce = -1;
static gint ett_time_sync_port_log_sync = -1;
static gint ett_time_sync_clock_type = -1;
static gint ett_time_sync_port_profile_id_info = -1;
static gint ett_time_sync_port_phys_addr_info = -1;
static gint ett_time_sync_port_proto_addr_info = -1;
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static gint ett_id_status = -1;
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
static expert_field ei_mal_identity_revision = EI_INIT;
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static expert_field ei_mal_identity_status = EI_INIT;
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
static expert_field ei_mal_msg_rout_num_classes = EI_INIT;
static expert_field ei_mal_time_sync_gm_clock = EI_INIT;
static expert_field ei_mal_time_sync_parent_clock = EI_INIT;
static expert_field ei_mal_time_sync_local_clock = EI_INIT;
static expert_field ei_mal_time_sync_port_state_info = EI_INIT;
static expert_field ei_mal_time_sync_port_state_info_ports = EI_INIT;
static expert_field ei_mal_time_sync_port_enable_cfg = EI_INIT;
static expert_field ei_mal_time_sync_port_enable_cfg_ports = EI_INIT;
static expert_field ei_mal_time_sync_port_log_announce = EI_INIT;
static expert_field ei_mal_time_sync_port_log_announce_ports = EI_INIT;
static expert_field ei_mal_time_sync_port_log_sync = EI_INIT;
static expert_field ei_mal_time_sync_port_log_sync_ports = EI_INIT;
static expert_field ei_mal_time_sync_clock_type = EI_INIT;
static expert_field ei_mal_time_sync_manufacture_id = EI_INIT;
static expert_field ei_mal_time_sync_prod_desc = EI_INIT;
static expert_field ei_mal_time_sync_prod_desc_64 = EI_INIT;
static expert_field ei_mal_time_sync_prod_desc_size = EI_INIT;
static expert_field ei_mal_time_sync_revision_data = EI_INIT;
static expert_field ei_mal_time_sync_revision_data_32 = EI_INIT;
static expert_field ei_mal_time_sync_revision_data_size = EI_INIT;
static expert_field ei_mal_time_sync_user_desc = EI_INIT;
static expert_field ei_mal_time_sync_user_desc_128 = EI_INIT;
static expert_field ei_mal_time_sync_user_desc_size = EI_INIT;
static expert_field ei_mal_time_sync_port_profile_id_info = EI_INIT;
static expert_field ei_mal_time_sync_port_profile_id_info_ports = EI_INIT;
static expert_field ei_mal_time_sync_port_phys_addr_info = EI_INIT;
static expert_field ei_mal_time_sync_port_phys_addr_info_ports = EI_INIT;
static expert_field ei_mal_time_sync_port_proto_addr_info = EI_INIT;
static expert_field ei_mal_time_sync_port_proto_addr_info_ports = EI_INIT;
static expert_field ei_mal_time_sync_sys_time_and_offset = EI_INIT;
static expert_field ei_proto_log_seg_format = EI_INIT;
static expert_field ei_mal_incomplete_epath = EI_INIT;
static expert_field ei_proto_electronic_key_format = EI_INIT;
static expert_field ei_proto_special_segment_format = EI_INIT;
static expert_field ei_proto_log_seg_type = EI_INIT;
static expert_field ei_proto_log_sub_seg_type = EI_INIT;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static expert_field ei_proto_ext_string_format = EI_INIT;
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
static expert_field ei_proto_seg_type = EI_INIT;
static expert_field ei_proto_unsupported_datatype = EI_INIT;
static expert_field ei_mal_serv_gal = EI_INIT;
static expert_field ei_mal_serv_gal_count = EI_INIT;
static expert_field ei_mal_serv_sal = EI_INIT;
static expert_field ei_mal_serv_sal_count = EI_INIT;
static expert_field ei_mal_msp_services = EI_INIT;
static expert_field ei_mal_msp_inv_offset = EI_INIT;
static expert_field ei_mal_msp_missing_services = EI_INIT;
static expert_field ei_mal_serv_find_next_object = EI_INIT;
static expert_field ei_mal_serv_find_next_object_count = EI_INIT;
static expert_field ei_mal_rpi_no_data = EI_INIT;
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
static expert_field ei_mal_fwd_close_missing_data = EI_INIT;
CIP: Add support for common class attributes Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2 Reviewed-on: https://code.wireshark.org/review/12502 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>
2015-12-10 16:39:46 +00:00
static expert_field ei_mal_opt_attr_list = EI_INIT;
static expert_field ei_mal_opt_service_list = EI_INIT;
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static expert_field ei_mal_padded_epath_size = EI_INIT;
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
static expert_field ei_mal_missing_string_data = EI_INIT;
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
Have CIP dissectors find the CIP Class dissector table, rather than have a externed global variable. Change-Id: Id8156680d67d65d87c156df05e8a66e2531728d2 Reviewed-on: https://code.wireshark.org/review/13709 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-28 19:13:30 +00:00
static dissector_table_t subdissector_class_table;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static dissector_table_t subdissector_symbol_table;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Translate function to string - CIP Service codes */
static const value_string cip_sc_vals[] = {
From Joakim Wiberg via bug 3670: This patch correctes serveral minor things. 1. Adds decoding of generic services to classes that have a separate dissect function. 2. Adds new error codes. 3. Adds new CIP objects. 4. Extends the VendorID list. svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
GENERIC_SC_LIST
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
};
/* Translate function to string - CIP Service codes for CM */
static const value_string cip_sc_vals_cm[] = {
From Joakim Wiberg via bug 3670: This patch correctes serveral minor things. 1. Adds decoding of generic services to classes that have a separate dissect function. 2. Adds new error codes. 3. Adds new CIP objects. 4. Extends the VendorID list. svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
GENERIC_SC_LIST
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Some class specific services */
{ SC_CM_FWD_CLOSE, "Forward Close" },
{ SC_CM_FWD_OPEN, "Forward Open" },
{ SC_CM_UNCON_SEND, "Unconnected Send" },
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
{ SC_CM_LARGE_FWD_OPEN, "Large Forward Open" },
{ SC_CM_GET_CONN_OWNER, "Get Connection Owner" },
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
};
Revert changes committed by an accident. Will be committed again later. svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
/* Translate function to string - CIP Service codes for MB */
static const value_string cip_sc_vals_mb[] = {
GENERIC_SC_LIST
/* Some class specific services */
{ SC_MB_READ_DISCRETE_INPUTS, "Read Discrete" },
{ SC_MB_READ_COILS, "Read Coils" },
{ SC_MB_READ_INPUT_REGISTERS, "Read Input Registers" },
{ SC_MB_READ_HOLDING_REGISTERS, "Read Holding Registers" },
{ SC_MB_WRITE_COILS, "Write Coils" },
{ SC_MB_WRITE_HOLDING_REGISTERS, "Write Holding Registers" },
{ SC_MB_PASSTHROUGH, "Modbus Passthrough" },
{ 0, NULL }
};
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Translate function to string - CIP Service codes for CCO */
static const value_string cip_sc_vals_cco[] = {
From Joakim Wiberg via bug 3670: This patch correctes serveral minor things. 1. Adds decoding of generic services to classes that have a separate dissect function. 2. Adds new error codes. 3. Adds new CIP objects. 4. Extends the VendorID list. svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
GENERIC_SC_LIST
/* Some class specific services */
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ SC_CCO_KICK_TIMER, "Kick Timer" },
{ SC_CCO_OPEN_CONN, "Open Connection" },
{ SC_CCO_CLOSE_CONN, "Close Connection" },
{ SC_CCO_STOP_CONN, "Stop Connection" },
{ SC_CCO_CHANGE_START, "Change Start" },
{ SC_CCO_GET_STATUS, "Get Status" },
{ SC_CCO_CHANGE_COMPLETE, "Change Complete" },
{ SC_CCO_AUDIT_CHANGE, "Audit Changes" },
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - CIP Request/Response */
Explicit value_string array size specifier not required. svn path=/trunk/; revision=43669
2012-07-11 20:26:24 +00:00
const value_string cip_sc_rr[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "Request" },
{ 1, "Response" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - Compatibility */
static const value_string cip_com_bit_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "Bit Cleared" },
{ 1, "Bit Set" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
Explicit value_string array size specifier not required. svn path=/trunk/; revision=43669
2012-07-11 20:26:24 +00:00
const value_string cip_reset_type_vals[] = {
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ 0, "Cycle Power" },
{ 1, "Factory Default" },
{ 2, "Keep Communication Parameters" },
{ 0, NULL }
};
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Translate function to string - Connection priority */
static const value_string cip_con_prio_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "Low Priority" },
{ 1, "High Priority" },
{ 2, "Scheduled" },
{ 3, "Urgent" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - Connection size fixed or variable */
static const value_string cip_con_fw_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "Fixed" },
{ 1, "Variable" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - Connection owner */
static const value_string cip_con_owner_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "Exclusive" },
{ 1, "Redundant" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - Connection direction */
static const value_string cip_con_dir_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "Client" },
{ 1, "Server" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Translate function to string - Connection type*/
static const value_string cip_con_vals[] = {
{ 0, "Originator" },
{ 1, "Target" },
{ 0, NULL }
};
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Translate function to string - Production trigger */
static const value_string cip_con_trigg_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "Cyclic" },
{ 1, "Change-Of-State" },
{ 2, "Application Object" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - Transport class */
static const value_string cip_con_class_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "0" },
{ 1, "1" },
{ 2, "2" },
{ 3, "3" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - Connection type */
static const value_string cip_con_type_vals[] = {
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
{ CONN_TYPE_NULL, "Null" },
{ CONN_TYPE_MULTICAST, "Multicast" },
{ CONN_TYPE_P2P, "Point to Point" },
{ CONN_TYPE_RESERVED, "Reserved" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
/* Translate function to string - Timeout Multiplier */
static const value_string cip_con_time_mult_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, "*4" },
{ 1, "*8" },
{ 2, "*16" },
{ 3, "*32" },
{ 4, "*64" },
{ 5, "*128" },
{ 6, "*256" },
{ 7, "*512" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{ 0, NULL }
};
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Translate function to string - Connection Last Action */
static const value_string cip_con_last_action_vals[] = {
{ 0, "No Owner" },
{ 1, "Owner Is Idle Mode" },
{ 2, "Owner Is Run Mode" },
{ 255, "Implementation not supported" },
{ 0, NULL }
};
/* Translate function to string - real time transfer format type */
static const value_string cip_con_rtf_vals[] = {
{ 0, "32-bit Header" },
{ 1, "Zero data length idle mode"},
{ 2, "Modeless" },
{ 3, "Heartbeat" },
{ 5, "Safety" },
{ 0, NULL }
};
/* Translate function to string - CCO change type */
static const value_string cip_cco_change_type_vals[] = {
{ 0, "Full" },
{ 1, "Incremental" },
{ 0, NULL }
};
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
static const value_string cip_time_sync_clock_class_vals[] = {
{ 6, "Primary Reference" },
{ 7, "Primary Reference (Hold)" },
{ 52, "Degraded Reference A (Master only)" },
{ 187, "Degraded Reference B (Master/Slave)" },
{ 248, "Default" },
{ 255, "Slave Only" },
{ 0, NULL }
};
static const value_string cip_time_sync_time_accuracy_vals[] = {
{ 0x20, "Accurate to within 25ns" },
{ 0x21, "Accurate to within 100ns" },
{ 0x22, "Accurate to within 250ns" },
{ 0x23, "Accurate to within 1us" },
{ 0x24, "Accurate to within 2.5us" },
{ 0x25, "Accurate to within 10us" },
{ 0x26, "Accurate to within 25us" },
{ 0x27, "Accurate to within 100us" },
{ 0x28, "Accurate to within 250us" },
{ 0x29, "Accurate to within 1ms" },
{ 0x2A, "Accurate to within 2.5ms" },
{ 0x2B, "Accurate to within 10ms" },
{ 0x2C, "Accurate to within 25ms" },
{ 0x2D, "Accurate to within 100ms" },
{ 0x2E, "Accurate to within 250ms" },
{ 0x2F, "Accurate to within 1s" },
{ 0x30, "Accurate to within 10s" },
{ 0x31, "Accurate to >10s" },
{ 0, NULL }
};
static const value_string cip_time_sync_time_source_vals[] = {
{ 0x10, "Atomic Clock" },
{ 0x20, "GPS" },
{ 0x30, "Terrestrial Radio" },
{ 0x40, "PTP" },
{ 0x50, "NTP" },
{ 0x60, "Hand Set" },
{ 0x90, "Other" },
{ 0xA0, "Internal Oscillator" },
{ 0, NULL }
};
static const value_string cip_time_sync_port_state_vals[] = {
{ 1, "INITIALIZING" },
{ 2, "FAULTY" },
{ 3, "DISABLED" },
{ 4, "LISTENING" },
{ 5, "PRE_MASTER" },
{ 6, "MASTER" },
{ 7, "PASSIVE" },
{ 8, "UNCALIBRATED" },
{ 9, "SLAVE" },
{ 0, NULL }
};
static const value_string cip_time_sync_network_protocol_vals[] = {
{ 1, "UDP/IPv4" },
{ 2, "UDP/IPv6" },
{ 3, "IEEE 802.3" },
{ 4, "DeviceNet" },
{ 5, "ControlNet" },
{ 0xFFFF, "Local or Unknown protocol" },
{ 0, NULL }
};
Add CIP Security objects These objects are defined in Volume 8, but it doesn't make sense to create a new dissector file for them, so just distribute them where it makes the most sense in the existing CIP dissectors. Also do some conversions to proto_tree_add_bitmask while in the neighborhood. Add support for EtherNet/IP over DTLS/TLS. Change-Id: I4e658e8871eebb222816229de7594ff766264308 Reviewed-on: https://code.wireshark.org/review/13710 Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-28 21:34:14 +00:00
static const value_string cip_security_state_vals[] = {
{ 0, "Factory Default Configuration" },
{ 1, "Initial Commissioning In Progress" },
{ 2, "Configured" },
{ 3, "Incomplete Configuration" },
{ 0, NULL }
};
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static const value_string cip_path_seg_vals[] = {
{ ((CI_PORT_SEGMENT>>5)&7), "Port Segment" },
{ ((CI_LOGICAL_SEGMENT>>5)&7), "Logical Segment" },
{ ((CI_NETWORK_SEGMENT>>5)&7), "Network Segment" },
{ ((CI_SYMBOLIC_SEGMENT>>5)&7), "Symbolic Segment" },
{ ((CI_DATA_SEGMENT>>5)&7), "Data Segment" },
{ 5, "Constructed Data Type" },
{ 6, "Elementary Data Type" },
{ 7, "Reserved" },
{ 0, NULL }
};
static const value_string cip_logical_segment_type_vals[] = {
{ ((CI_LOGICAL_SEG_CLASS_ID>>2)&7), "Class ID" },
{ ((CI_LOGICAL_SEG_INST_ID>>2)&7), "Instance ID" },
{ ((CI_LOGICAL_SEG_MBR_ID>>2)&7), "Member ID" },
{ ((CI_LOGICAL_SEG_CON_POINT>>2)&7), "Connection Point" },
{ ((CI_LOGICAL_SEG_ATTR_ID>>2)&7), "Attribute ID" },
{ ((CI_LOGICAL_SEG_SPECIAL>>2)&7), "Special" },
{ ((CI_LOGICAL_SEG_SERV_ID>>2)&7), "Service ID" },
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ ((CI_LOGICAL_SEG_EXT_LOGICAL>>2)&7), "Extended Logical" },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ 0, NULL }
};
static const value_string cip_logical_segment_format_vals[] = {
{ CI_LOGICAL_SEG_8_BIT, "8-bit Logical Segment" },
{ CI_LOGICAL_SEG_16_BIT, "16-bit Logical Segment" },
{ CI_LOGICAL_SEG_32_BIT, "32-bit Logical Segment" },
{ CI_LOGICAL_SEG_RES_2, "Reserved" },
{ 0, NULL }
};
static const value_string cip_logical_seg_vals[] = {
{((CI_LOGICAL_SEG_CLASS_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_8_BIT), "8-Bit Class Segment"},
{((CI_LOGICAL_SEG_CLASS_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_16_BIT), "16-Bit Class Segment"},
{((CI_LOGICAL_SEG_CLASS_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_32_BIT), "32-Bit Class Segment"},
{((CI_LOGICAL_SEG_INST_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_8_BIT), "8-Bit Instance Segment"},
{((CI_LOGICAL_SEG_INST_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_16_BIT), "16-Bit Instance Segment"},
{((CI_LOGICAL_SEG_INST_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_32_BIT), "32-Bit Instance Segment"},
{((CI_LOGICAL_SEG_MBR_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_8_BIT), "8-Bit Member Segment"},
{((CI_LOGICAL_SEG_MBR_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_16_BIT), "16-Bit Member Segment"},
{((CI_LOGICAL_SEG_MBR_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_32_BIT), "32-Bit Member Segment"},
{((CI_LOGICAL_SEG_CON_POINT & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_8_BIT), "8-Bit Connection Point Segment"},
{((CI_LOGICAL_SEG_CON_POINT & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_16_BIT), "16-Bit Connection Point Segment"},
{((CI_LOGICAL_SEG_CON_POINT & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_32_BIT), "32-Bit Connection Point Segment"},
{((CI_LOGICAL_SEG_ATTR_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_8_BIT), "8-Bit Attribute Segment"},
{((CI_LOGICAL_SEG_ATTR_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_16_BIT), "16-Bit Attribute Segment"},
{((CI_LOGICAL_SEG_ATTR_ID & CI_LOGICAL_SEG_TYPE_MASK)|CI_LOGICAL_SEG_32_BIT), "32-Bit Attribute Segment"},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{((CI_LOGICAL_SEG_SERV_ID & CI_LOGICAL_SEG_TYPE_MASK) | CI_LOGICAL_SEG_8_BIT), "8-Bit Service ID Segment"},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{CI_LOGICAL_SEG_SPECIAL, "Electronic Key Segment"},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{((CI_LOGICAL_SEG_EXT_LOGICAL & CI_LOGICAL_SEG_TYPE_MASK) | CI_LOGICAL_SEG_8_BIT), "8-Bit Extended Logical Segment"},
{((CI_LOGICAL_SEG_EXT_LOGICAL & CI_LOGICAL_SEG_TYPE_MASK) | CI_LOGICAL_SEG_16_BIT), "16-Bit Extended Logical Segment"},
{((CI_LOGICAL_SEG_EXT_LOGICAL & CI_LOGICAL_SEG_TYPE_MASK) | CI_LOGICAL_SEG_32_BIT), "32-Bit Extended Logical Segment"},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ 0, NULL }
};
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static const value_string cip_ext_logical_segment_format_vals[] = {
{ 0, "Reserved" },
{ 1, "Array Index" },
{ 2, "Indirect Array Index" },
{ 3, "Bit Index" },
{ 4, "Indirect Bit Index" },
{ 5, "Structure Member Number" },
{ 6, "Structure Member Handle" },
{ 0, NULL }
};
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static const value_string cip_data_segment_type_vals[] = {
{CI_DATA_SEG_SIMPLE, "Simple Data Segment"},
{CI_DATA_SEG_SYMBOL, "ANSI Extended Symbol Segment"},
{ 0, NULL }
};
static const value_string cip_network_segment_type_vals[] = {
{CI_NETWORK_SEG_SCHEDULE, "Schedule Segment"},
{CI_NETWORK_SEG_FIXED_TAG, "Fixed Tag Segment"},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{CI_NETWORK_SEG_PROD_INHI, "Production Inhibit Time in Milliseconds"},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{CI_NETWORK_SEG_SAFETY, "Safety Segment"},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{CI_NETWORK_SEG_PROD_INHI_US, "Production Inhibit Time in Microseconds"},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{CI_NETWORK_SEG_EXTENDED, "Extended Network Segment"},
{ 0, NULL }
};
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static const value_string cip_symbolic_format_vals[] = {
{ 1, "Double Byte Segment" },
{ 2, "Triple Byte Segment" },
{ 6, "Numeric Segment" },
{ 0, NULL }
};
static const value_string cip_symbolic_numeric_format_vals[] = {
{ 6, "USINT" },
{ 7, "UINT" },
{ 8, "UDINT" },
{ 0, NULL }
};
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
static const value_string cip_safety_segment_format_type_vals[] = {
{0, "Target Format"},
{1, "Router Format"},
{2, "Extended Format"},
{ 0, NULL }
};
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static const value_string cip_cm_rpi_type_vals[] = {
{0, "RPI acceptable"},
{1, "Unspecified"},
{2, "Minimum acceptable RPI"},
{3, "Maximum acceptable RPI"},
{4, "Required RPI to correct mismatch"},
{ 0, NULL }
};
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Translate function to string - CIP General Status codes */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static const value_string cip_gs_vals[] = {
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ CI_GRC_SUCCESS, "Success" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{ CI_GRC_FAILURE, "Connection failure" },
{ CI_GRC_NO_RESOURCE, "Resource unavailable" },
{ CI_GRC_BAD_DATA, "Invalid parameter value" },
{ CI_GRC_BAD_PATH, "Path segment error" },
{ CI_GRC_BAD_CLASS_INSTANCE, "Path destination unknown" },
{ CI_GRC_PARTIAL_DATA, "Partial transfer" },
{ CI_GRC_CONN_LOST, "Connection lost" },
{ CI_GRC_BAD_SERVICE, "Service not supported" },
{ CI_GRC_BAD_ATTR_DATA, "Invalid attribute value" },
{ CI_GRC_ATTR_LIST_ERROR, "Attribute list error" },
{ CI_GRC_ALREADY_IN_MODE, "Already in requested mode/state" },
{ CI_GRC_BAD_OBJ_MODE, "Object state conflict" },
{ CI_GRC_OBJ_ALREADY_EXISTS, "Object already exists" },
{ CI_GRC_ATTR_NOT_SETTABLE, "Attribute not settable" },
{ CI_GRC_PERMISSION_DENIED, "Privilege violation" },
{ CI_GRC_DEV_IN_WRONG_STATE, "Device state conflict" },
{ CI_GRC_REPLY_DATA_TOO_LARGE,"Reply data too large" },
{ CI_GRC_FRAGMENT_PRIMITIVE, "Fragmentation of a primitive value" },
{ CI_GRC_CONFIG_TOO_SMALL, "Not enough data" },
{ CI_GRC_UNDEFINED_ATTR, "Attribute not supported" },
{ CI_GRC_CONFIG_TOO_BIG, "Too much data" },
{ CI_GRC_OBJ_DOES_NOT_EXIST, "Object does not exist" },
{ CI_GRC_NO_FRAGMENTATION, "Service fragmentation sequence not in progress" },
{ CI_GRC_DATA_NOT_SAVED, "No stored attribute data" },
{ CI_GRC_DATA_WRITE_FAILURE, "Store operation failure" },
{ CI_GRC_REQUEST_TOO_LARGE, "Routing failure, request packet too large" },
{ CI_GRC_RESPONSE_TOO_LARGE, "Routing failure, response packet too large" },
{ CI_GRC_MISSING_LIST_DATA, "Missing attribute list entry data" },
{ CI_GRC_INVALID_LIST_STATUS, "Invalid attribute value list" },
{ CI_GRC_SERVICE_ERROR, "Embedded service error" },
{ CI_GRC_CONN_RELATED_FAILURE,"Vendor specific error" },
{ CI_GRC_INVALID_PARAMETER, "Invalid parameter" },
{ CI_GRC_WRITE_ONCE_FAILURE, "Write-once value or medium already written" },
From Joakim Wiberg via bug 3670: This patch correctes serveral minor things. 1. Adds decoding of generic services to classes that have a separate dissect function. 2. Adds new error codes. 3. Adds new CIP objects. 4. Extends the VendorID list. svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
{ CI_GRC_INVALID_REPLY, "Invalid reply received" },
{ CI_GRC_BUFFER_OVERFLOW, "Buffer overflow" },
{ CI_GRC_MESSAGE_FORMAT, "Invalid message format" },
{ CI_GRC_BAD_KEY_IN_PATH, "Key failure in path" },
{ CI_GRC_BAD_PATH_SIZE, "Path size invalid" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{ CI_GRC_UNEXPECTED_ATTR, "Unexpected attribute in list" },
{ CI_GRC_INVALID_MEMBER, "Invalid Member ID" },
{ CI_GRC_MEMBER_NOT_SETTABLE, "Member not settable" },
From Joakim Wiberg via bug 3670: This patch correctes serveral minor things. 1. Adds decoding of generic services to classes that have a separate dissect function. 2. Adds new error codes. 3. Adds new CIP objects. 4. Extends the VendorID list. svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
{ CI_GRC_G2_SERVER_FAILURE, "Group 2 only server general failure" },
{ CI_GRC_UNKNOWN_MB_ERROR, "Unknown Modbus error" },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ CI_GRC_ATTRIBUTE_NOT_GET, "Attribute not gettable" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
value_string_ext cip_gs_vals_ext = VALUE_STRING_EXT_INIT(cip_gs_vals);
/* Connection Manager Extended Status codes */
#define CM_ES_DUP_FWD_OPEN 0x100
#define CM_ES_CLASS_AND_TRIGGER 0x103
#define CM_ES_OWNERSHIP_CONFLICT 0x106
#define CM_ES_TARGET_CONN_NOT_FOUND 0x107
#define CM_ES_INVALID_NET_CONN_PARAM 0x108
#define CM_ES_INVALID_CONNECTION_SIZE 0x109
#define CM_ES_TARGET_CONNECTION_NOT_CONFIGURED 0x110
#define CM_ES_RPI_NOT_SUPPORTED 0x111
#define CM_ES_RPI_NOT_ACCEPTABLE 0x112
#define CM_ES_OUT_OF_CONNECTIONS 0x113
#define CM_ES_VENDOR_ID_OR_PRODUCT_CODE_MISMATCH 0x114
#define CM_ES_DEVICE_TYPE_MISMATCH 0x115
#define CM_ES_REVISION_MISMATCH 0x116
#define CM_ES_INVALID_PROD_CONS_APP_PATH 0x117
#define CM_ES_INVALID_OR_INCONSISTENT_CONF_APP_PATH 0x118
#define CM_ES_NON_LISTEN_ONLY_CONN_NOT_OPENED 0x119
#define CM_ES_TARGET_OBJECT_OUT_OF_CONNECTIONS 0x11A
#define CM_ES_RPI_SMALLER_THAN_PROD_INHIBIT_TIME 0x11B
#define CM_ES_TRANSPORT_CLASS_NOT_SUPPORTED 0x11C
#define CM_ES_PRODUCTION_TRIGGER_NOT_SUPPORTED 0x11D
#define CM_ES_DIRECTION_NOT_SUPPORTED 0x11E
#define CM_ES_INVALID_OT_NET_CONN_FIX_VAR 0x11F
#define CM_ES_INVALID_TO_NET_CONN_FIX_VAR 0x120
#define CM_ES_INVALID_OT_NET_CONN_PRIORITY 0x121
#define CM_ES_INVALID_TO_NET_CONN_PRIORITY 0x122
#define CM_ES_INVALID_OT_NET_CONN_TYPE 0x123
#define CM_ES_INVALID_TO_NET_CONN_TYPE 0x124
#define CM_ES_INVALID_OT_NET_CONN_REDUNDANT_OWNER 0x125
#define CM_ES_INVALID_CONFIGURATION_SIZE 0x126
#define CM_ES_INVALID_OT_SIZE 0x127
#define CM_ES_INVALID_TO_SIZE 0x128
#define CM_ES_INVALID_CONFIGURATION_APP_PATH 0x129
#define CM_ES_INVALID_CONSUMING_APP_PATH 0x12A
#define CM_ES_INVALID_PRODUCING_APP_PATH 0x12B
#define CM_ES_CONFIGURATION_SYMBOL_NOT_EXIST 0x12C
#define CM_ES_CONSUMING_SYMBOL_NOT_EXIST 0x12D
#define CM_ES_PRODUCING_SYMBOL_NOT_EXIST 0x12E
#define CM_ES_INCONSISTENT_APP_PATH_COMBO 0x12F
#define CM_ES_INCONSISTENT_CONSUME_DATA_FORMAT 0x130
#define CM_ES_INCONSISTENT_PRODUCE_DATA_FORMAT 0x131
#define CM_ES_NULL_FORWARD_OPEN_NOT_SUPPORTED 0x132
#define CM_ES_CONNECTION_TIMED_OUT 0x203
#define CM_ES_UNCONNECTED_REQUEST_TIMED_OUT 0x204
#define CM_ES_PARAMETER_ERROR_IN_UNCONNECTED_REQUEST 0x205
#define CM_ES_MESSAGE_TOO_LARGE_FOR_UNCONNECTED_SEND 0x206
#define CM_ES_UNCONNECTED_ACK_WITHOUT_REPLY 0x207
#define CM_ES_NO_BUFFER_MEMORY_AVAILABLE 0x301
#define CM_ES_NETWORK_BANDWIDTH_NOT_AVAIL_FOR_DATA 0x302
#define CM_ES_NO_CONSUMED_CONN_ID_FILTER_AVAILABLE 0x303
#define CM_ES_NOT_CONFIGURED_TO_SEND_SCHEDULED_DATA 0x304
#define CM_ES_SCHEDULE_SIGNATURE_MISMATCH 0x305
#define CM_ES_SCHEDULE_SIGNATURE_VALIDATION_NOT_POSS 0x306
#define CM_ES_PORT_NOT_AVAILABLE 0x311
#define CM_ES_LINK_ADDRESS_NOT_VALID 0x312
#define CM_ES_INVALID_SEGMENT_IN_CONN_PATH 0x315
#define CM_ES_FWD_CLOSE_CONN_PATH_MISMATCH 0x316
#define CM_ES_SCHEDULING_NOT_SPECIFIED 0x317
#define CM_ES_LINK_ADDRESS_TO_SELF_INVALID 0x318
#define CM_ES_SECONDARY_RESOURCES_UNAVAILABLE 0x319
#define CM_ES_RACK_CONNECTION_ALREADY_ESTABLISHED 0x31A
#define CM_ES_MODULE_CONNECTION_ALREADY_ESTABLISHED 0x31B
#define CM_ES_MISCELLANEOUS 0x31C
#define CM_ES_REDUNDANT_CONNECTION_MISMATCH 0x31D
#define CM_ES_NO_CONSUMER_RES_AVAIL_IN_PROD_MODULE 0x31E
#define CM_ES_NO_CONSUMER_RES_CONF_IN_PROD_MODULE 0x31F
#define CM_ES_NETWORK_LINK_OFFLINE 0x800
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
#define CM_ES_INCOMPATIBLE_MULTICAST_RPI 0x801
#define CM_ES_INVALID_SAFETY_CONN_SIZE 0x802
#define CM_ES_INVALID_SAFETY_CONN_FORMAT 0x803
#define CM_ES_INVALID_TIME_CORRECTION_CONN_PARAM 0x804
#define CM_ES_INVALID_PING_INTERVAL_EPI_MULTIPLIER 0x805
#define CM_ES_TIME_COORDINATION_MSG_MIN_MULTIPLIER 0x806
#define CM_ES_NETWORK_TIME_EXPECTATION_MULTIPLIER 0x807
#define CM_ES_TIMEOUT_MULTIPLIER 0x808
#define CM_ES_INVALID_MAX_CONSUMER_NUMBER 0x809
#define CM_ES_INVALID_CPCRC 0x80A
#define CM_ES_TIME_CORRECTION_CONN_ID_INVALID 0x80B
#define CM_ES_SCID_MISMATCH 0x80C
#define CM_ES_TUNID_NOT_SET 0x80D
#define CM_ES_TUNID_MISMATCH 0x80E
#define CM_ES_CONFIGURATION_OPERATION_NOT_ALLOWED 0x80F
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
#define CM_ES_NO_TARGET_APP_DATA_AVAILABLE 0x810
#define CM_ES_NO_ORIG_APP_DATA_AVAILABLE 0x811
#define CM_ES_NODE_ADDRESS_CHANGED_AFTER_SCHEDULED 0x812
#define CM_ES_NOT_CONFIGURED_MULTICAST 0x813
#define CM_ES_INVALID_PROD_CONS_DATA_FORMAT 0x814
/* Translate function to string - CIP General Status codes */
static const value_string cip_cm_ext_st_vals[] = {
{ CM_ES_DUP_FWD_OPEN, "Connection in use or duplicate Forward Open" },
{ CM_ES_CLASS_AND_TRIGGER, "Transport class and trigger combination not supported" },
{ CM_ES_OWNERSHIP_CONFLICT, "Ownership conflict" },
{ CM_ES_TARGET_CONN_NOT_FOUND, "Target connection not found" },
{ CM_ES_INVALID_NET_CONN_PARAM, "Invalid network connection parameter" },
{ CM_ES_INVALID_CONNECTION_SIZE, "Invalid connection size" },
{ CM_ES_TARGET_CONNECTION_NOT_CONFIGURED, "Target for connection not configured" },
{ CM_ES_RPI_NOT_SUPPORTED, "RPI not supported" },
{ CM_ES_RPI_NOT_ACCEPTABLE, "RPI value(s) not acceptable" },
{ CM_ES_OUT_OF_CONNECTIONS, "Out of connections" },
{ CM_ES_VENDOR_ID_OR_PRODUCT_CODE_MISMATCH, "Vendor ID or product code mismatch" },
{ CM_ES_DEVICE_TYPE_MISMATCH, "Device type mismatch" },
{ CM_ES_REVISION_MISMATCH, "Revision mismatch" },
{ CM_ES_INVALID_PROD_CONS_APP_PATH, "Invalid produced or consumed application path" },
{ CM_ES_INVALID_OR_INCONSISTENT_CONF_APP_PATH, "Invalid or inconsistent configuration application path" },
{ CM_ES_NON_LISTEN_ONLY_CONN_NOT_OPENED, "Non-listen only connection not opened" },
{ CM_ES_TARGET_OBJECT_OUT_OF_CONNECTIONS, "Target object out of connections" },
{ CM_ES_RPI_SMALLER_THAN_PROD_INHIBIT_TIME, "RPI is smaller than the production inhibit time" },
{ CM_ES_TRANSPORT_CLASS_NOT_SUPPORTED, "Transport class not supported" },
{ CM_ES_PRODUCTION_TRIGGER_NOT_SUPPORTED, "Production trigger not supported" },
{ CM_ES_DIRECTION_NOT_SUPPORTED, "Direction not supported" },
{ CM_ES_INVALID_OT_NET_CONN_FIX_VAR, "Invalid O->T Fixed/Variable" },
{ CM_ES_INVALID_TO_NET_CONN_FIX_VAR, "Invalid T->O Fixed/Variable" },
{ CM_ES_INVALID_OT_NET_CONN_PRIORITY, "Invalid O->T Priority" },
{ CM_ES_INVALID_TO_NET_CONN_PRIORITY, "Invalid T->O Priority" },
{ CM_ES_INVALID_OT_NET_CONN_TYPE, "Invalid O->T connection type" },
{ CM_ES_INVALID_TO_NET_CONN_TYPE, "Invalid T->O connection type" },
{ CM_ES_INVALID_OT_NET_CONN_REDUNDANT_OWNER, "Invalid O->T redundant owner" },
{ CM_ES_INVALID_CONFIGURATION_SIZE, "Invalid configuration size" },
{ CM_ES_INVALID_OT_SIZE, "Invalid O->T size" },
{ CM_ES_INVALID_TO_SIZE, "Invalid T->O size" },
{ CM_ES_INVALID_CONFIGURATION_APP_PATH, "Invalid configuration application path" },
{ CM_ES_INVALID_CONSUMING_APP_PATH, "Invalid consuming application path" },
{ CM_ES_INVALID_PRODUCING_APP_PATH, "Invalid producing application path" },
{ CM_ES_CONFIGURATION_SYMBOL_NOT_EXIST, "Configuration symbol does not exist" },
{ CM_ES_CONSUMING_SYMBOL_NOT_EXIST, "Consuming symbol does not exist" },
{ CM_ES_PRODUCING_SYMBOL_NOT_EXIST, "Producing symbol does not exist" },
{ CM_ES_INCONSISTENT_APP_PATH_COMBO, "Inconsistent application path combination" },
{ CM_ES_INCONSISTENT_CONSUME_DATA_FORMAT, "Inconsistent consume data format" },
{ CM_ES_INCONSISTENT_PRODUCE_DATA_FORMAT, "Inconsistent produce data format" },
{ CM_ES_NULL_FORWARD_OPEN_NOT_SUPPORTED, "NULL ForwardOpen not supported" },
{ CM_ES_CONNECTION_TIMED_OUT, "Connection timed out" },
{ CM_ES_UNCONNECTED_REQUEST_TIMED_OUT, "Unconnected request timed out" },
{ CM_ES_PARAMETER_ERROR_IN_UNCONNECTED_REQUEST, "Parameter error in unconnected request" },
{ CM_ES_MESSAGE_TOO_LARGE_FOR_UNCONNECTED_SEND, "Message too large for UnconnectedSend" },
{ CM_ES_UNCONNECTED_ACK_WITHOUT_REPLY, "Unconnected acknowledged without reply" },
{ CM_ES_NO_BUFFER_MEMORY_AVAILABLE, "No buffer memory available" },
{ CM_ES_NETWORK_BANDWIDTH_NOT_AVAIL_FOR_DATA, "Network bandwidth not available for data" },
{ CM_ES_NO_CONSUMED_CONN_ID_FILTER_AVAILABLE, "No consumed connection ID filter available" },
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
{ CM_ES_NOT_CONFIGURED_TO_SEND_SCHEDULED_DATA, "Not configured to send scheduled priority data" },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ CM_ES_SCHEDULE_SIGNATURE_MISMATCH, "Schedule signature mismatch" },
{ CM_ES_SCHEDULE_SIGNATURE_VALIDATION_NOT_POSS, "Schedule signature validation not possible" },
{ CM_ES_PORT_NOT_AVAILABLE, "Port not available" },
{ CM_ES_LINK_ADDRESS_NOT_VALID, "Link address not valid" },
{ CM_ES_INVALID_SEGMENT_IN_CONN_PATH, "Invalid segment in connection path" },
{ CM_ES_FWD_CLOSE_CONN_PATH_MISMATCH, "ForwardClose connection path mismatch" },
{ CM_ES_SCHEDULING_NOT_SPECIFIED, "Scheduling not specified" },
{ CM_ES_LINK_ADDRESS_TO_SELF_INVALID, "Link address to self invalid" },
{ CM_ES_SECONDARY_RESOURCES_UNAVAILABLE, "Secondary resources unavailable" },
{ CM_ES_RACK_CONNECTION_ALREADY_ESTABLISHED, "Rack connection already established" },
{ CM_ES_MODULE_CONNECTION_ALREADY_ESTABLISHED, "Module connection already established" },
{ CM_ES_MISCELLANEOUS, "Miscellaneous" },
{ CM_ES_REDUNDANT_CONNECTION_MISMATCH, "Redundant connection mismatch" },
{ CM_ES_NO_CONSUMER_RES_AVAIL_IN_PROD_MODULE, "No more user configurable link consumer resources available in the producing module" },
{ CM_ES_NO_CONSUMER_RES_CONF_IN_PROD_MODULE, "No more user configurable link consumer resources configured in the producing module" },
value_string_ext: Reorder entries in value_string arrays to get Binary Search instead of Linear Search. svn path=/trunk/; revision=42418
2012-05-04 07:34:06 +00:00
{ CM_ES_NETWORK_LINK_OFFLINE, "Network link offline" },
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{ CM_ES_INCOMPATIBLE_MULTICAST_RPI, "Incompatible Multicast RPI" },
{ CM_ES_INVALID_SAFETY_CONN_SIZE, "Invalid Safety Connection Size" },
{ CM_ES_INVALID_SAFETY_CONN_FORMAT, "Invalid Safety Connection Format" },
{ CM_ES_INVALID_TIME_CORRECTION_CONN_PARAM, "Invalid Time Correction Connection Parameters" },
{ CM_ES_INVALID_PING_INTERVAL_EPI_MULTIPLIER, "Invalid Ping Interval EPI Multiplier" },
{ CM_ES_TIME_COORDINATION_MSG_MIN_MULTIPLIER, "Time Coordination Msg Min Multiplier" },
{ CM_ES_NETWORK_TIME_EXPECTATION_MULTIPLIER, "Network Time Expectation Multiplier" },
{ CM_ES_TIMEOUT_MULTIPLIER, "Timeout Multiplier" },
{ CM_ES_INVALID_MAX_CONSUMER_NUMBER, "Invalid Max Consumer Number" },
{ CM_ES_INVALID_CPCRC, "Invalid CPCRC" },
{ CM_ES_TIME_CORRECTION_CONN_ID_INVALID, "Time Correction Connection ID Invalid" },
{ CM_ES_SCID_MISMATCH, "SCID Mismatch" },
{ CM_ES_TUNID_NOT_SET, "TUNID not set" },
{ CM_ES_TUNID_MISMATCH, "TUNID Mismatch" },
{ CM_ES_CONFIGURATION_OPERATION_NOT_ALLOWED, "Configuration operation not allowed" },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ CM_ES_NO_TARGET_APP_DATA_AVAILABLE, "No target application data available" },
{ CM_ES_NO_ORIG_APP_DATA_AVAILABLE, "No originator application data available" },
{ CM_ES_NODE_ADDRESS_CHANGED_AFTER_SCHEDULED, "Node address has changed since the network was scheduled" },
{ CM_ES_NOT_CONFIGURED_MULTICAST, "Not configured for off-subnet multicast" },
{ CM_ES_INVALID_PROD_CONS_DATA_FORMAT, "Invalid produce/consume data format" },
{ 0, NULL }
};
value_string_ext cip_cm_ext_st_vals_ext = VALUE_STRING_EXT_INIT(cip_cm_ext_st_vals);
/* Translate Vendor IDs */
static const value_string cip_vendor_vals[] = {
{ 0, "Reserved" },
{ 1, "Rockwell Automation/Allen-Bradley" },
{ 2, "Namco Controls Corp." },
{ 3, "Honeywell Inc." },
{ 4, "Parker Hannifin Corp. (Veriflo Division)" },
{ 5, "Rockwell Automation/Reliance Elec." },
{ 6, "Reserved" },
{ 7, "SMC Corporation" },
{ 8, "Molex Incorporated" },
{ 9, "Western Reserve Controls Corp." },
{ 10, "Advanced Micro Controls Inc. (AMCI)" },
{ 11, "ASCO Pneumatic Controls" },
{ 12, "Banner Engineering Corp." },
{ 13, "Belden Wire & Cable Company" },
{ 14, "Cooper Interconnect" },
{ 15, "Reserved" },
{ 16, "Daniel Woodhead Co. (Woodhead Connectivity)" },
{ 17, "Dearborn Group Inc." },
{ 18, "Reserved" },
{ 19, "Helm Instrument Company" },
{ 20, "Huron Net Works" },
{ 21, "Lumberg, Inc." },
{ 22, "Online Development Inc.(Automation Value)" },
{ 23, "Vorne Industries, Inc." },
{ 24, "ODVA Special Reserve" },
{ 25, "Reserved" },
{ 26, "Festo Corporation" },
{ 27, "Reserved" },
{ 28, "Reserved" },
{ 29, "Reserved" },
{ 30, "Unico, Inc." },
{ 31, "Ross Controls" },
{ 32, "Reserved" },
{ 33, "Reserved" },
{ 34, "Hohner Corp." },
{ 35, "Micro Mo Electronics, Inc." },
{ 36, "MKS Instruments, Inc." },
{ 37, "Yaskawa Electric America formerly Magnetek Drives" },
{ 38, "Reserved" },
{ 39, "AVG Automation (Uticor)" },
{ 40, "Wago Corporation" },
{ 41, "Kinetics (Unit Instruments)" },
{ 42, "IMI Norgren Limited" },
{ 43, "BALLUFF, Inc." },
{ 44, "Yaskawa Electric America, Inc." },
{ 45, "Eurotherm Controls Inc" },
{ 46, "ABB Industrial Systems" },
{ 47, "Omron Corporation" },
{ 48, "TURCk, Inc." },
{ 49, "Grayhill Inc." },
{ 50, "Real Time Automation (C&ID)" },
{ 51, "Reserved" },
{ 52, "Numatics, Inc." },
{ 53, "Lutze, Inc." },
{ 54, "Reserved" },
{ 55, "Reserved" },
{ 56, "Softing GmbH" },
{ 57, "Pepperl + Fuchs" },
{ 58, "Spectrum Controls, Inc." },
{ 59, "D.I.P. Inc. MKS Inst." },
{ 60, "Applied Motion Products, Inc." },
{ 61, "Sencon Inc." },
{ 62, "High Country Tek" },
{ 63, "SWAC Automation Consult GmbH" },
{ 64, "Clippard Instrument Laboratory" },
{ 65, "Reserved" },
{ 66, "Reserved" },
{ 67, "Reserved" },
{ 68, "Eaton Electrical" },
{ 69, "Reserved" },
{ 70, "Reserved" },
{ 71, "Toshiba International Corp." },
{ 72, "Control Technology Incorporated" },
{ 73, "TCS (NZ) Ltd." },
{ 74, "Hitachi, Ltd." },
{ 75, "ABB Robotics Products AB" },
{ 76, "NKE Corporation" },
{ 77, "Rockwell Software, Inc." },
{ 78, "Escort Memory Systems (A Datalogic Group Co.)" },
{ 79, "Reserved" },
{ 80, "Industrial Devices Corporation" },
{ 81, "IXXAT Automation GmbH" },
{ 82, "Mitsubishi Electric Automation, Inc." },
{ 83, "OPTO-22" },
{ 84, "Reserved" },
{ 85, "Reserved" },
{ 86, "Horner Electric" },
{ 87, "Burkert Werke GmbH & Co. KG" },
{ 88, "Reserved" },
{ 89, "Industrial Indexing Systems, Inc." },
{ 90, "HMS Industrial Networks AB" },
{ 91, "Robicon" },
{ 92, "Helix Technology (Granville-Phillips)" },
{ 93, "Arlington Laboratory" },
{ 94, "Advantech Co. Ltd." },
{ 95, "Square D Company" },
{ 96, "Digital Electronics Corp." },
{ 97, "Danfoss" },
{ 98, "Reserved" },
{ 99, "Reserved" },
{ 100, "Bosch Rexroth Corporation, Pneumatics" },
{ 101, "Applied Materials, Inc." },
{ 102, "Showa Electric Wire & Cable Co." },
{ 103, "Pacific Scientific (API Controls Inc.)" },
{ 104, "Sharp Manufacturing Systems Corp." },
{ 105, "Olflex Wire & Cable, Inc." },
{ 106, "Reserved" },
{ 107, "Unitrode" },
{ 108, "Beckhoff Automation GmbH" },
{ 109, "National Instruments" },
{ 110, "Mykrolis Corporations (Millipore)" },
{ 111, "International Motion Controls Corp." },
{ 112, "Reserved" },
{ 113, "SEG Kempen GmbH" },
{ 114, "Reserved" },
{ 115, "Reserved" },
{ 116, "MTS Systems Corp." },
{ 117, "Krones, Inc" },
{ 118, "Reserved" },
{ 119, "EXOR Electronic R & D" },
{ 120, "SIEI S.p.A." },
{ 121, "KUKA Roboter GmbH" },
{ 122, "Reserved" },
{ 123, "SEC (Samsung Electronics Co., Ltd)" },
{ 124, "Binary Electronics Ltd" },
{ 125, "Flexible Machine Controls" },
{ 126, "Reserved" },
{ 127, "ABB Inc. (Entrelec)" },
{ 128, "MAC Valves, Inc." },
{ 129, "Auma Actuators Inc" },
{ 130, "Toyoda Machine Works, Ltd" },
{ 131, "Reserved" },
{ 132, "Reserved" },
{ 133, "Balogh T.A.G., Corporation" },
{ 134, "TR Systemtechnik GmbH" },
{ 135, "UNIPULSE Corporation" },
{ 136, "Reserved" },
{ 137, "Reserved" },
{ 138, "Conxall Corporation Inc." },
{ 139, "Reserved" },
{ 140, "Reserved" },
{ 141, "Kuramo Electric Co., Ltd." },
{ 142, "Creative Micro Designs" },
{ 143, "GE Industrial Systems" },
{ 144, "Leybold Vacuum GmbH" },
{ 145, "Siemens Energy & Automation/Drives" },
{ 146, "Kodensha Ltd" },
{ 147, "Motion Engineering, Inc." },
{ 148, "Honda Engineering Co., Ltd" },
{ 149, "EIM Valve Controls" },
{ 150, "Melec Inc." },
{ 151, "Sony Manufacturing Systems Corporation" },
{ 152, "North American Mfg." },
{ 153, "WATLOW" },
{ 154, "Japan Radio Co., Ltd" },
{ 155, "NADEX Co., Ltd" },
{ 156, "Ametek Automation & Process Technologies" },
{ 157, "Reserved" },
{ 158, "KVASER AB" },
{ 159, "IDEC IZUMI Corporation" },
{ 160, "Mitsubishi Heavy Industries Ltd" },
{ 161, "Mitsubishi Electric Corporation" },
{ 162, "Horiba-STEC Inc." },
{ 163, "esd electronic system design gmbh" },
{ 164, "DAIHEN Corporation" },
{ 165, "Tyco Valves & Controls/Keystone" },
{ 166, "EBARA Corporation" },
{ 167, "Reserved" },
{ 168, "Reserved" },
{ 169, "Hokuyo Electric Co. Ltd" },
{ 170, "Pyramid Solutions, Inc." },
{ 171, "Denso Wave Incorporated" },
{ 172, "HLS Hard-Line Solutions Inc" },
{ 173, "Caterpillar, Inc." },
{ 174, "PDL Electronics Ltd." },
{ 175, "Reserved" },
{ 176, "Red Lion Controls" },
{ 177, "ANELVA Corporation" },
{ 178, "Toyo Denki Seizo KK" },
{ 179, "Sanyo Denki Co., Ltd" },
{ 180, "Advanced Energy Japan K.K. (Aera Japan)" },
{ 181, "Pilz GmbH & Co" },
{ 182, "Marsh Bellofram-Bellofram PCD Division" },
{ 183, "Reserved" },
{ 184, "M-SYSTEM Co. Ltd" },
{ 185, "Nissin Electric Co., Ltd" },
{ 186, "Hitachi Metals Ltd." },
{ 187, "Oriental Motor Company" },
{ 188, "A&D Co., Ltd" },
{ 189, "Phasetronics, Inc." },
{ 190, "Cummins Engine Company" },
{ 191, "Deltron Inc." },
{ 192, "Geneer Corporation" },
{ 193, "Anatol Automation, Inc." },
{ 194, "Reserved" },
{ 195, "Reserved" },
{ 196, "Medar, Inc." },
{ 197, "Comdel Inc." },
{ 198, "Advanced Energy Industries, Inc" },
{ 199, "Reserved" },
{ 200, "DAIDEN Co., Ltd" },
{ 201, "CKD Corporation" },
{ 202, "Toyo Electric Corporation" },
{ 203, "Reserved" },
{ 204, "AuCom Electronics Ltd" },
{ 205, "Shinko Electric Co., Ltd" },
{ 206, "Vector Informatik GmbH" },
{ 207, "Reserved" },
{ 208, "Moog Inc." },
{ 209, "Contemporary Controls" },
{ 210, "Tokyo Sokki Kenkyujo Co., Ltd" },
{ 211, "Schenck-AccuRate, Inc." },
{ 212, "The Oilgear Company" },
{ 213, "Reserved" },
{ 214, "ASM Japan K.K." },
{ 215, "HIRATA Corp." },
{ 216, "SUNX Limited" },
{ 217, "Meidensha Corp." },
{ 218, "NIDEC SANKYO CORPORATION (Sankyo Seiki Mfg. Co., Ltd)" },
{ 219, "KAMRO Corp." },
{ 220, "Nippon System Development Co., Ltd" },
{ 221, "EBARA Technologies Inc." },
{ 222, "Reserved" },
{ 223, "Reserved" },
{ 224, "SG Co., Ltd" },
{ 225, "Vaasa Institute of Technology" },
{ 226, "MKS Instruments (ENI Technology)" },
{ 227, "Tateyama System Laboratory Co., Ltd." },
{ 228, "QLOG Corporation" },
{ 229, "Matric Limited Inc." },
{ 230, "NSD Corporation" },
{ 231, "Reserved" },
{ 232, "Sumitomo Wiring Systems, Ltd" },
{ 233, "Group 3 Technology Ltd" },
{ 234, "CTI Cryogenics" },
{ 235, "POLSYS CORP" },
{ 236, "Ampere Inc." },
{ 237, "Reserved" },
{ 238, "Simplatroll Ltd" },
{ 239, "Reserved" },
{ 240, "Reserved" },
{ 241, "Leading Edge Design" },
{ 242, "Humphrey Products" },
{ 243, "Schneider Automation, Inc." },
{ 244, "Westlock Controls Corp." },
{ 245, "Nihon Weidmuller Co., Ltd" },
{ 246, "Brooks Instrument (Div. of Emerson)" },
{ 247, "Reserved" },
{ 248, " Moeller GmbH" },
{ 249, "Varian Vacuum Products" },
{ 250, "Yokogawa Electric Corporation" },
{ 251, "Electrical Design Daiyu Co., Ltd" },
{ 252, "Omron Software Co., Ltd" },
{ 253, "BOC Edwards" },
{ 254, "Control Technology Corporation" },
{ 255, "Bosch Rexroth" },
{ 256, "Turck" },
{ 257, "Control Techniques PLC" },
{ 258, "Hardy Instruments, Inc." },
{ 259, "LS Industrial Systems" },
{ 260, "E.O.A. Systems Inc." },
{ 261, "Reserved" },
{ 262, "New Cosmos Electric Co., Ltd." },
{ 263, "Sense Eletronica LTDA" },
{ 264, "Xycom, Inc." },
{ 265, "Baldor Electric" },
{ 266, "Reserved" },
{ 267, "Patlite Corporation" },
{ 268, "Reserved" },
{ 269, "Mogami Wire & Cable Corporation" },
{ 270, "Welding Technology Corporation (WTC)" },
{ 271, "Reserved" },
{ 272, "Deutschmann Automation GmbH" },
{ 273, "ICP Panel-Tec Inc." },
{ 274, "Bray Controls USA" },
{ 275, "Reserved" },
{ 276, "Status Technologies" },
{ 277, "Trio Motion Technology Ltd" },
{ 278, "Sherrex Systems Ltd" },
{ 279, "Adept Technology, Inc." },
{ 280, "Spang Power Electronics" },
{ 281, "Reserved" },
{ 282, "Acrosser Technology Co., Ltd" },
{ 283, "Hilscher GmbH" },
{ 284, "IMAX Corporation" },
{ 285, "Electronic Innovation, Inc. (Falter Engineering)" },
{ 286, "Netlogic Inc." },
{ 287, "Bosch Rexroth Corporation, Indramat" },
{ 288, "Reserved" },
{ 289, "Reserved" },
{ 290, "Murata Machinery Ltd." },
{ 291, "MTT Company Ltd." },
{ 292, "Kanematsu Semiconductor Corp." },
{ 293, "Takebishi Electric Sales Co." },
{ 294, "Tokyo Electron Device Ltd" },
{ 295, "PFU Limited" },
{ 296, "Hakko Automation Co., Ltd." },
{ 297, "Advanet Inc." },
{ 298, "Tokyo Electron Software Technologies Ltd." },
{ 299, "Reserved" },
{ 300, "Shinagawa Electric Wire Co., Ltd." },
{ 301, "Yokogawa M&C Corporation" },
{ 302, "KONAN Electric Co., Ltd." },
{ 303, "Binar Elektronik AB" },
{ 304, "Furukawa Electric Co." },
{ 305, "Cooper Energy Services" },
{ 306, "Schleicher GmbH & Co." },
{ 307, "Hirose Electric Co., Ltd" },
{ 308, "Western Servo Design Inc." },
{ 309, "Prosoft Technology" },
{ 310, "Reserved" },
{ 311, "Towa Shoko Co., Ltd" },
{ 312, "Kyopal Co., Ltd" },
{ 313, "Extron Co." },
{ 314, "Wieland Electric GmbH" },
{ 315, "SEW Eurodrive GmbH" },
{ 316, "Aera Corporation" },
{ 317, "STA Reutlingen" },
{ 318, "Reserved" },
{ 319, "Fuji Electric Co., Ltd." },
{ 320, "Reserved" },
{ 321, "Reserved" },
{ 322, "ifm efector, inc." },
{ 323, "Reserved" },
{ 324, "IDEACOD-Hohner Automation S.A." },
{ 325, "CommScope Inc." },
{ 326, "GE Fanuc Automation North America, Inc." },
{ 327, "Matsushita Electric Industrial Co., Ltd" },
{ 328, "Okaya Electronics Corporation" },
{ 329, "KASHIYAMA Industries, Ltd" },
{ 330, "JVC" },
{ 331, "Interface Corporation" },
{ 332, "Grape Systems Inc." },
{ 333, "Reserved" },
Fix conflicting entries in CIP vendor list. 344 is registered to KEBA. (Ref: http://www.odva.org/Home/CIPSUPPLIERDIRECTORY/LicensedVendorList/tabid/86/lng/en-US/Default.aspx) svn path=/trunk/; revision=42417
2012-05-04 07:27:41 +00:00
{ 334, "Reserved" },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ 335, "Toshiba IT & Control Systems Corporation" },
{ 336, "Sanyo Machine Works, Ltd." },
{ 337, "Vansco Electronics Ltd." },
{ 338, "Dart Container Corp." },
{ 339, "Livingston & Co., Inc." },
{ 340, "Alfa Laval LKM as" },
{ 341, "BF ENTRON Ltd. (British Federal)" },
{ 342, "Bekaert Engineering NV" },
{ 343, "Ferran Scientific Inc." },
{ 344, "KEBA AG" },
{ 345, "Endress + Hauser" },
{ 346, "Reserved" },
{ 347, "ABB ALSTOM Power UK Ltd. (EGT)" },
{ 348, "Berger Lahr GmbH" },
{ 349, "Reserved" },
{ 350, "Federal Signal Corp." },
{ 351, "Kawasaki Robotics (USA), Inc." },
{ 352, "Bently Nevada Corporation" },
{ 353, "Reserved" },
{ 354, "FRABA Posital GmbH" },
{ 355, "Elsag Bailey, Inc." },
{ 356, "Fanuc Robotics America" },
{ 357, "Reserved" },
{ 358, "Surface Combustion, Inc." },
{ 359, "Reserved" },
{ 360, "AILES Electronics Ind. Co., Ltd." },
{ 361, "Wonderware Corporation" },
{ 362, "Particle Measuring Systems, Inc." },
{ 363, "Reserved" },
{ 364, "Reserved" },
{ 365, "BITS Co., Ltd" },
{ 366, "Japan Aviation Electronics Industry Ltd" },
{ 367, "Keyence Corporation" },
{ 368, "Kuroda Precision Industries Ltd." },
{ 369, "Mitsubishi Electric Semiconductor Application" },
{ 370, "Nippon Seisen Cable, Ltd." },
{ 371, "Omron ASO Co., Ltd" },
{ 372, "Seiko Seiki Co., Ltd." },
{ 373, "Sumitomo Heavy Industries, Ltd." },
{ 374, "Tango Computer Service Corporation" },
{ 375, "Technology Service, Inc." },
{ 376, "Toshiba Information Systems (Japan) Corporation" },
{ 377, "TOSHIBA Schneider Inverter Corporation" },
{ 378, "Toyooki Kogyo Co., Ltd." },
{ 379, "XEBEC" },
{ 380, "Madison Cable Corporation" },
{ 381, "Hitati Engineering & Services Co., Ltd" },
{ 382, "TEM-TECH Lab Co., Ltd" },
{ 383, "International Laboratory Corporation" },
{ 384, "Dyadic Systems Co., Ltd." },
{ 385, "SETO Electronics Industry Co., Ltd" },
{ 386, "Tokyo Electron Kyushu Limited" },
{ 387, "KEI System Co., Ltd" },
{ 388, "Reserved" },
{ 389, "Asahi Engineering Co., Ltd" },
{ 390, "Contrex Inc." },
{ 391, "Paradigm Controls Ltd." },
{ 392, "Reserved" },
{ 393, "Ohm Electric Co., Ltd." },
{ 394, "RKC Instrument Inc." },
{ 395, "Suzuki Motor Corporation" },
{ 396, "Custom Servo Motors Inc." },
{ 397, "PACE Control Systems" },
{ 398, "Reserved" },
{ 399, "Reserved" },
{ 400, "LINTEC Co., Ltd." },
{ 401, "Hitachi Cable Ltd." },
{ 402, "BUSWARE Direct" },
{ 403, "Eaton Electric B.V. (former Holec Holland N.V.)" },
{ 404, "VAT Vakuumventile AG" },
{ 405, "Scientific Technologies Incorporated" },
{ 406, "Alfa Instrumentos Eletronicos Ltda" },
{ 407, "TWK Elektronik GmbH" },
{ 408, "ABB Welding Systems AB" },
{ 409, "BYSTRONIC Maschinen AG" },
{ 410, "Kimura Electric Co., Ltd" },
{ 411, "Nissei Plastic Industrial Co., Ltd" },
{ 412, "Reserved" },
{ 413, "Kistler-Morse Corporation" },
{ 414, "Proteous Industries Inc." },
{ 415, "IDC Corporation" },
{ 416, "Nordson Corporation" },
{ 417, "Rapistan Systems" },
{ 418, "LP-Elektronik GmbH" },
{ 419, "GERBI & FASE S.p.A.(Fase Saldatura)" },
{ 420, "Phoenix Digital Corporation" },
{ 421, "Z-World Engineering" },
{ 422, "Honda R&D Co., Ltd." },
{ 423, "Bionics Instrument Co., Ltd." },
{ 424, "Teknic, Inc." },
{ 425, "R.Stahl, Inc." },
{ 426, "Reserved" },
{ 427, "Ryco Graphic Manufacturing Inc." },
{ 428, "Giddings & Lewis, Inc." },
{ 429, "Koganei Corporation" },
{ 430, "Reserved" },
{ 431, "Nichigoh Communication Electric Wire Co., Ltd." },
{ 432, "Reserved" },
{ 433, "Fujikura Ltd." },
{ 434, "AD Link Technology Inc." },
{ 435, "StoneL Corporation" },
{ 436, "Computer Optical Products, Inc." },
{ 437, "CONOS Inc." },
{ 438, "Erhardt + Leimer GmbH" },
{ 439, "UNIQUE Co. Ltd" },
{ 440, "Roboticsware, Inc." },
{ 441, "Nachi Fujikoshi Corporation" },
{ 442, "Hengstler GmbH" },
{ 443, "Reserved" },
{ 444, "SUNNY GIKEN Inc." },
{ 445, "Lenze Drive Systems GmbH" },
{ 446, "CD Systems B.V." },
{ 447, "FMT/Aircraft Gate Support Systems AB" },
{ 448, "Axiomatic Technologies Corp" },
{ 449, "Embedded System Products, Inc." },
{ 450, "Reserved" },
{ 451, "Mencom Corporation" },
{ 452, "Reserved" },
{ 453, "Matsushita Welding Systems Co., Ltd." },
{ 454, "Dengensha Mfg. Co. Ltd." },
{ 455, "Quinn Systems Ltd." },
{ 456, "Tellima Technology Ltd" },
{ 457, "MDT, Software" },
{ 458, "Taiwan Keiso Co., Ltd" },
{ 459, "Pinnacle Systems" },
{ 460, "Ascom Hasler Mailing Sys" },
{ 461, "INSTRUMAR Limited" },
{ 462, "Reserved" },
{ 463, "Navistar International Transportation Corp" },
{ 464, "Huettinger Elektronik GmbH + Co. KG" },
{ 465, "OCM Technology Inc." },
{ 466, "Professional Supply Inc." },
{ 467, "Control Solutions" },
{ 468, "Baumer IVO GmbH & Co. KG" },
{ 469, "Worcester Controls Corporation" },
{ 470, "Pyramid Technical Consultants, Inc." },
{ 471, "Reserved" },
{ 472, "Apollo Fire Detectors Limited" },
{ 473, "Avtron Manufacturing, Inc." },
{ 474, "Reserved" },
{ 475, "Tokyo Keiso Co., Ltd." },
{ 476, "Daishowa Swiki Co., Ltd." },
{ 477, "Kojima Instruments Inc." },
{ 478, "Shimadzu Corporation" },
{ 479, "Tatsuta Electric Wire & Cable Co., Ltd." },
{ 480, "MECS Corporation" },
{ 481, "Tahara Electric" },
{ 482, "Koyo Electronics" },
{ 483, "Clever Devices" },
{ 484, "GCD Hardware & Software GmbH" },
{ 485, "Reserved" },
{ 486, "Miller Electric Mfg Co." },
{ 487, "GEA Tuchenhagen GmbH" },
{ 488, "Riken Keiki Co., LTD" },
{ 489, "Keisokugiken Corporation" },
{ 490, "Fuji Machine Mfg. Co., Ltd" },
{ 491, "Reserved" },
{ 492, "Nidec-Shimpo Corp." },
{ 493, "UTEC Corporation" },
{ 494, "Sanyo Electric Co. Ltd." },
{ 495, "Reserved" },
{ 496, "Reserved" },
{ 497, "Okano Electric Wire Co. Ltd" },
{ 498, "Shimaden Co. Ltd." },
{ 499, "Teddington Controls Ltd" },
{ 500, "Reserved" },
{ 501, "VIPA GmbH" },
{ 502, "Warwick Manufacturing Group" },
{ 503, "Danaher Controls" },
{ 504, "Reserved" },
{ 505, "Reserved" },
{ 506, "American Science & Engineering" },
{ 507, "Accutron Controls International Inc." },
{ 508, "Norcott Technologies Ltd" },
{ 509, "TB Woods, Inc" },
{ 510, "Proportion-Air, Inc." },
{ 511, "SICK Stegmann GmbH" },
{ 512, "Reserved" },
{ 513, "Edwards Signaling" },
{ 514, "Sumitomo Metal Industries, Ltd" },
{ 515, "Cosmo Instruments Co., Ltd." },
{ 516, "Denshosha Co., Ltd." },
{ 517, "Kaijo Corp." },
{ 518, "Michiproducts Co., Ltd." },
{ 519, "Miura Corporation" },
{ 520, "TG Information Network Co., Ltd." },
{ 521, "Fujikin , Inc." },
{ 522, "Estic Corp." },
{ 523, "GS Hydraulic Sales" },
{ 524, "Reserved" },
{ 525, "MTE Limited" },
{ 526, "Hyde Park Electronics, Inc." },
{ 527, "Pfeiffer Vacuum GmbH" },
{ 528, "Cyberlogic Technologies" },
{ 529, "OKUMA Corporation FA Systems Division" },
{ 530, "Reserved" },
{ 531, "Hitachi Kokusai Electric Co., Ltd." },
{ 532, "SHINKO TECHNOS Co., Ltd." },
{ 533, "Itoh Electric Co., Ltd." },
{ 534, "Colorado Flow Tech Inc." },
{ 535, "Love Controls Division/Dwyer Inst." },
{ 536, "Alstom Drives and Controls" },
{ 537, "The Foxboro Company" },
{ 538, "Tescom Corporation" },
{ 539, "Reserved" },
{ 540, "Atlas Copco Controls UK" },
{ 541, "Reserved" },
{ 542, "Autojet Technologies" },
{ 543, "Prima Electronics S.p.A." },
{ 544, "PMA GmbH" },
{ 545, "Shimafuji Electric Co., Ltd" },
{ 546, "Oki Electric Industry Co., Ltd" },
{ 547, "Kyushu Matsushita Electric Co., Ltd" },
{ 548, "Nihon Electric Wire & Cable Co., Ltd" },
{ 549, "Tsuken Electric Ind Co., Ltd" },
{ 550, "Tamadic Co." },
{ 551, "MAATEL SA" },
{ 552, "OKUMA America" },
{ 553, "Control Techniques PLC-NA" },
{ 554, "TPC Wire & Cable" },
{ 555, "ATI Industrial Automation" },
{ 556, "Microcontrol (Australia) Pty Ltd" },
{ 557, "Serra Soldadura, S.A." },
{ 558, "Southwest Research Institute" },
{ 559, "Cabinplant International" },
{ 560, "Sartorius Mechatronics T&H GmbH" },
{ 561, "Comau S.p.A. Robotics & Final Assembly Division" },
{ 562, "Phoenix Contact" },
{ 563, "Yokogawa MAT Corporation" },
{ 564, "asahi sangyo co., ltd." },
{ 565, "Reserved" },
{ 566, "Akita Myotoku Ltd." },
{ 567, "OBARA Corp." },
{ 568, "Suetron Electronic GmbH" },
{ 569, "Reserved" },
{ 570, "Serck Controls Limited" },
{ 571, "Fairchild Industrial Products Company" },
{ 572, "ARO S.A." },
{ 573, "M2C GmbH" },
{ 574, "Shin Caterpillar Mitsubishi Ltd." },
{ 575, "Santest Co., Ltd." },
{ 576, "Cosmotechs Co., Ltd." },
{ 577, "Hitachi Electric Systems" },
{ 578, "Smartscan Ltd" },
{ 579, "Woodhead Software & Electronics France" },
{ 580, "Athena Controls, Inc." },
{ 581, "Syron Engineering & Manufacturing, Inc." },
{ 582, "Asahi Optical Co., Ltd." },
{ 583, "Sansha Electric Mfg. Co., Ltd." },
{ 584, "Nikki Denso Co., Ltd." },
{ 585, "Star Micronics, Co., Ltd." },
{ 586, "Ecotecnia Socirtat Corp." },
{ 587, "AC Technology Corp." },
{ 588, "West Instruments Limited" },
{ 589, "NTI Limited" },
{ 590, "Delta Computer Systems, Inc." },
{ 591, "FANUC Ltd." },
{ 592, "Hearn-Gu Lee" },
{ 593, "ABB Automation Products" },
{ 594, "Orion Machinery Co., Ltd." },
{ 595, "Reserved" },
{ 596, "Wire-Pro, Inc." },
{ 597, "Beijing Huakong Technology Co. Ltd." },
{ 598, "Yokoyama Shokai Co., Ltd." },
{ 599, "Toyogiken Co., Ltd." },
{ 600, "Coester Equipamentos Eletronicos Ltda." },
{ 601, "Reserved" },
{ 602, "Electroplating Engineers of Japan Ltd." },
{ 603, "ROBOX S.p.A." },
{ 604, "Spraying Systems Company" },
{ 605, "Benshaw Inc." },
{ 606, "ZPA-DP A.S." },
{ 607, "Wired Rite Systems" },
{ 608, "Tandis Research, Inc." },
{ 609, "SSD Drives GmbH" },
{ 610, "ULVAC Japan Ltd." },
{ 611, "DYNAX Corporation" },
{ 612, "Nor-Cal Products, Inc." },
{ 613, "Aros Electronics AB" },
{ 614, "Jun-Tech Co., Ltd." },
{ 615, "HAN-MI Co. Ltd." },
{ 616, "uniNtech (formerly SungGi Internet)" },
{ 617, "Hae Pyung Electronics Reserch Institute" },
{ 618, "Milwaukee Electronics" },
{ 619, "OBERG Industries" },
{ 620, "Parker Hannifin/Compumotor Division" },
{ 621, "TECHNO DIGITAL CORPORATION" },
{ 622, "Network Supply Co., Ltd." },
{ 623, "Union Electronics Co., Ltd." },
{ 624, "Tritronics Services PM Ltd." },
{ 625, "Rockwell Automation-Sprecher+Schuh" },
{ 626, "Matsushita Electric Industrial Co., Ltd/Motor Co." },
{ 627, "Rolls-Royce Energy Systems, Inc." },
{ 628, "JEONGIL INTERCOM CO., LTD" },
{ 629, "Interroll Corp." },
{ 630, "Hubbell Wiring Device-Kellems (Delaware)" },
{ 631, "Intelligent Motion Systems" },
{ 632, "Reserved" },
{ 633, "INFICON AG" },
{ 634, "Hirschmann, Inc." },
{ 635, "The Siemon Company" },
{ 636, "YAMAHA Motor Co. Ltd." },
{ 637, "aska corporation" },
{ 638, "Woodhead Connectivity" },
{ 639, "Trimble AB" },
{ 640, "Murrelektronik GmbH" },
{ 641, "Creatrix Labs, Inc." },
{ 642, "TopWorx" },
{ 643, "Kumho Industrial Co., Ltd." },
{ 644, "Wind River Systems, Inc." },
{ 645, "Bihl & Wiedemann GmbH" },
{ 646, "Harmonic Drive Systems Inc." },
{ 647, "Rikei Corporation" },
{ 648, "BL Autotec, Ltd." },
{ 649, "Hana Information & Technology Co., Ltd." },
{ 650, "Seoil Electric Co., Ltd." },
{ 651, "Fife Corporation" },
{ 652, "Shanghai Electrical Apparatus Research Institute" },
{ 653, "Reserved" },
{ 654, "Parasense Development Centre" },
{ 655, "Reserved" },
{ 656, "Reserved" },
{ 657, "Six Tau S.p.A." },
{ 658, "Aucos GmbH" },
{ 659, "Rotork Controls" },
{ 660, "Automationdirect.com" },
{ 661, "Thermo BLH" },
{ 662, "System Controls, Ltd." },
{ 663, "Univer S.p.A." },
{ 664, "MKS-Tenta Technology" },
{ 665, "Lika Electronic SNC" },
{ 666, "Mettler-Toledo, Inc." },
{ 667, "DXL USA Inc." },
{ 668, "Rockwell Automation/Entek IRD Intl." },
{ 669, "Nippon Otis Elevator Company" },
{ 670, "Sinano Electric, Co., Ltd." },
{ 671, "Sony Manufacturing Systems" },
{ 672, "Reserved" },
{ 673, "Contec Co., Ltd." },
{ 674, "Automated Solutions" },
{ 675, "Controlweigh" },
{ 676, "Reserved" },
{ 677, "Fincor Electronics" },
{ 678, "Cognex Corporation" },
{ 679, "Qualiflow" },
{ 680, "Weidmuller, Inc." },
{ 681, "Morinaga Milk Industry Co., Ltd." },
{ 682, "Takagi Industrial Co., Ltd." },
{ 683, "Wittenstein AG" },
{ 684, "Sena Technologies, Inc." },
{ 685, "Reserved" },
{ 686, "APV Products Unna" },
{ 687, "Creator Teknisk Utvedkling AB" },
{ 688, "Reserved" },
{ 689, "Mibu Denki Industrial Co., Ltd." },
{ 690, "Takamastsu Machineer Section" },
{ 691, "Startco Engineering Ltd." },
{ 692, "Reserved" },
{ 693, "Holjeron" },
{ 694, "ALCATEL High Vacuum Technology" },
{ 695, "Taesan LCD Co., Ltd." },
{ 696, "POSCON" },
{ 697, "VMIC" },
{ 698, "Matsushita Electric Works, Ltd." },
{ 699, "IAI Corporation" },
{ 700, "Horst GmbH" },
{ 701, "MicroControl GmbH & Co." },
{ 702, "Leine & Linde AB" },
{ 703, "Reserved" },
{ 704, "EC Elettronica Srl" },
{ 705, "VIT Software HB" },
{ 706, "Bronkhorst High-Tech B.V." },
{ 707, "Optex Co., Ltd." },
{ 708, "Yosio Electronic Co." },
{ 709, "Terasaki Electric Co., Ltd." },
{ 710, "Sodick Co., Ltd." },
{ 711, "MTS Systems Corporation-Automation Division" },
{ 712, "Mesa Systemtechnik" },
{ 713, "SHIN HO SYSTEM Co., Ltd." },
{ 714, "Goyo Electronics Co, Ltd." },
{ 715, "Loreme" },
{ 716, "SAB Brockskes GmbH & Co. KG" },
{ 717, "Trumpf Laser GmbH + Co. KG" },
{ 718, "Niigata Electronic Instruments Co., Ltd." },
{ 719, "Yokogawa Digital Computer Corporation" },
{ 720, "O.N. Electronic Co., Ltd." },
{ 721, "Industrial Control Communication, Inc." },
{ 722, "ABB, Inc." },
{ 723, "ElectroWave USA, Inc." },
{ 724, "Industrial Network Controls, LLC" },
{ 725, "KDT Systems Co., Ltd." },
{ 726, "SEFA Technology Inc." },
{ 727, "Nippon POP Rivets and Fasteners Ltd." },
{ 728, "Yamato Scale Co., Ltd." },
{ 729, "Zener Electric" },
{ 730, "GSE Scale Systems" },
{ 731, "ISAS (Integrated Switchgear & Sys. Pty Ltd)" },
{ 732, "Beta LaserMike Limited" },
{ 733, "TOEI Electric Co., Ltd." },
{ 734, "Hakko Electronics Co., Ltd" },
{ 735, "Reserved" },
{ 736, "RFID, Inc." },
{ 737, "Adwin Corporation" },
{ 738, "Osaka Vacuum, Ltd." },
{ 739, "A-Kyung Motion, Inc." },
{ 740, "Camozzi S.P. A." },
{ 741, "Crevis Co., LTD" },
{ 742, "Rice Lake Weighing Systems" },
{ 743, "Linux Network Services" },
{ 744, "KEB Antriebstechnik GmbH" },
{ 745, "Hagiwara Electric Co., Ltd." },
{ 746, "Glass Inc. International" },
{ 747, "Reserved" },
{ 748, "DVT Corporation" },
{ 749, "Woodward Governor" },
{ 750, "Mosaic Systems, Inc." },
{ 751, "Laserline GmbH" },
{ 752, "COM-TEC, Inc." },
{ 753, "Weed Instrument" },
{ 754, "Prof-face European Technology Center" },
{ 755, "Fuji Automation Co., Ltd." },
{ 756, "Matsutame Co., Ltd." },
{ 757, "Hitachi Via Mechanics, Ltd." },
{ 758, "Dainippon Screen Mfg. Co. Ltd." },
{ 759, "FLS Automation A/S" },
{ 760, "ABB Stotz Kontakt GmbH" },
{ 761, "Technical Marine Service" },
{ 762, "Advanced Automation Associates, Inc." },
{ 763, "Baumer Ident GmbH" },
{ 764, "Tsubakimoto Chain Co." },
{ 765, "Reserved" },
{ 766, "Furukawa Co., Ltd." },
{ 767, "Active Power" },
{ 768, "CSIRO Mining Automation" },
{ 769, "Matrix Integrated Systems" },
{ 770, "Digitronic Automationsanlagen GmbH" },
{ 771, "SICK STEGMANN Inc." },
{ 772, "TAE-Antriebstechnik GmbH" },
{ 773, "Electronic Solutions" },
{ 774, "Rocon L.L.C." },
{ 775, "Dijitized Communications Inc." },
{ 776, "Asahi Organic Chemicals Industry Co., Ltd." },
{ 777, "Hodensha" },
{ 778, "Harting, Inc. NA" },
{ 779, "Kubler GmbH" },
{ 780, "Yamatake Corporation" },
{ 781, "JEOL" },
{ 782, "Yamatake Industrial Systems Co., Ltd." },
{ 783, "HAEHNE Elektronische Messgerate GmbH" },
{ 784, "Ci Technologies Pty Ltd (for Pelamos Industries)" },
{ 785, "N. SCHLUMBERGER & CIE" },
{ 786, "Teijin Seiki Co., Ltd." },
{ 787, "DAIKIN Industries, Ltd" },
{ 788, "RyuSyo Industrial Co., Ltd." },
{ 789, "SAGINOMIYA SEISAKUSHO, INC." },
{ 790, "Seishin Engineering Co., Ltd." },
{ 791, "Japan Support System Ltd." },
{ 792, "Decsys" },
{ 793, "Metronix Messgerate u. Elektronik GmbH" },
{ 794, "Reserved" },
{ 795, "Vaccon Company, Inc." },
{ 796, "Siemens Energy & Automation, Inc." },
{ 797, "Ten X Technology, Inc." },
{ 798, "Tyco Electronics" },
{ 799, "Delta Power Electronics Center" },
{ 800, "Denker" },
{ 801, "Autonics Corporation" },
{ 802, "JFE Electronic Engineering Pty. Ltd." },
{ 803, "Reserved" },
{ 804, "Electro-Sensors, Inc." },
{ 805, "Digi International, Inc." },
{ 806, "Texas Instruments" },
{ 807, "ADTEC Plasma Technology Co., Ltd" },
{ 808, "SICK AG" },
{ 809, "Ethernet Peripherals, Inc." },
{ 810, "Animatics Corporation" },
{ 811, "Reserved" },
{ 812, "Process Control Corporation" },
{ 813, "SystemV. Inc." },
{ 814, "Danaher Motion SRL" },
{ 815, "SHINKAWA Sensor Technology, Inc." },
{ 816, "Tesch GmbH & Co. KG" },
{ 817, "Reserved" },
{ 818, "Trend Controls Systems Ltd." },
{ 819, "Guangzhou ZHIYUAN Electronic Co., Ltd." },
{ 820, "Mykrolis Corporation" },
{ 821, "Bethlehem Steel Corporation" },
{ 822, "KK ICP" },
{ 823, "Takemoto Denki Corporation" },
{ 824, "The Montalvo Corporation" },
{ 825, "Reserved" },
{ 826, "LEONI Special Cables GmbH" },
{ 827, "Reserved" },
{ 828, "ONO SOKKI CO.,LTD." },
{ 829, "Rockwell Samsung Automation" },
{ 830, "SHINDENGEN ELECTRIC MFG. CO. LTD" },
{ 831, "Origin Electric Co. Ltd." },
{ 832, "Quest Technical Solutions, Inc." },
{ 833, "LS Cable, Ltd." },
{ 834, "Enercon-Nord Electronic GmbH" },
{ 835, "Northwire Inc." },
{ 836, "Engel Elektroantriebe GmbH" },
{ 837, "The Stanley Works" },
{ 838, "Celesco Transducer Products, Inc." },
{ 839, "Chugoku Electric Wire and Cable Co." },
{ 840, "Kongsberg Simrad AS" },
{ 841, "Panduit Corporation" },
{ 842, "Spellman High Voltage Electronics Corp." },
{ 843, "Kokusai Electric Alpha Co., Ltd." },
{ 844, "Brooks Automation, Inc." },
{ 845, "ANYWIRE CORPORATION" },
{ 846, "Honda Electronics Co. Ltd" },
{ 847, "REO Elektronik AG" },
{ 848, "Fusion UV Systems, Inc." },
{ 849, "ASI Advanced Semiconductor Instruments GmbH" },
{ 850, "Datalogic, Inc." },
{ 851, "SoftPLC Corporation" },
{ 852, "Dynisco Instruments LLC" },
{ 853, "WEG Industrias SA" },
{ 854, "Frontline Test Equipment, Inc." },
{ 855, "Tamagawa Seiki Co., Ltd." },
{ 856, "Multi Computing Co., Ltd." },
{ 857, "RVSI" },
{ 858, "Commercial Timesharing Inc." },
{ 859, "Tennessee Rand Automation LLC" },
{ 860, "Wacogiken Co., Ltd" },
{ 861, "Reflex Integration Inc." },
{ 862, "Siemens AG, A&D PI Flow Instruments" },
{ 863, "G. Bachmann Electronic GmbH" },
{ 864, "NT International" },
{ 865, "Schweitzer Engineering Laboratories" },
{ 866, "ATR Industrie-Elektronik GmbH Co." },
{ 867, "PLASMATECH Co., Ltd" },
{ 868, "Reserved" },
{ 869, "GEMU GmbH & Co. KG" },
{ 870, "Alcorn McBride Inc." },
{ 871, "MORI SEIKI CO., LTD" },
{ 872, "NodeTech Systems Ltd" },
{ 873, "Emhart Teknologies" },
{ 874, "Cervis, Inc." },
{ 875, "FieldServer Technologies (Div Sierra Monitor Corp)" },
{ 876, "NEDAP Power Supplies" },
{ 877, "Nippon Sanso Corporation" },
{ 878, "Mitomi Giken Co., Ltd." },
{ 879, "PULS GmbH" },
{ 880, "Reserved" },
{ 881, "Japan Control Engineering Ltd" },
{ 882, "Embedded Systems Korea (Former Zues Emtek Co Ltd.)" },
{ 883, "Automa SRL" },
{ 884, "Harms+Wende GmbH & Co KG" },
{ 885, "SAE-STAHL GmbH" },
{ 886, "Microwave Data Systems" },
{ 887, "Bernecker + Rainer Industrie-Elektronik GmbH" },
{ 888, "Hiprom Technologies" },
{ 889, "Reserved" },
{ 890, "Nitta Corporation" },
{ 891, "Kontron Modular Computers GmbH" },
{ 892, "Marlin Controls" },
{ 893, "ELCIS s.r.l." },
{ 894, "Acromag, Inc." },
{ 895, "Avery Weigh-Tronix" },
{ 896, "Reserved" },
{ 897, "Reserved" },
{ 898, "Reserved" },
{ 899, "Practicon Ltd" },
{ 900, "Schunk GmbH & Co. KG" },
{ 901, "MYNAH Technologies" },
{ 902, "Defontaine Groupe" },
{ 903, "Emerson Process Management Power & Water Solutions" },
{ 904, "F.A. Elec" },
{ 905, "Hottinger Baldwin Messtechnik GmbH" },
{ 906, "Coreco Imaging, Inc." },
{ 907, "London Electronics Ltd." },
{ 908, "HSD SpA" },
{ 909, "Comtrol Corporation" },
{ 910, "TEAM, S.A. (Tecnica Electronica de Automatismo Y Medida)" },
{ 911, "MAN B&W Diesel Ltd. Regulateurs Europa" },
{ 912, "Reserved" },
{ 913, "Reserved" },
{ 914, "Micro Motion, Inc." },
{ 915, "Eckelmann AG" },
{ 916, "Hanyoung Nux" },
{ 917, "Ransburg Industrial Finishing KK" },
{ 918, "Kun Hung Electric Co. Ltd." },
{ 919, "Brimos wegbebakening b.v." },
{ 920, "Nitto Seiki Co., Ltd" },
{ 921, "PPT Vision, Inc." },
{ 922, "Yamazaki Machinery Works" },
{ 923, "SCHMIDT Technology GmbH" },
{ 924, "Parker Hannifin SpA (SBC Division)" },
{ 925, "HIMA Paul Hildebrandt GmbH" },
{ 926, "RivaTek, Inc." },
{ 927, "Misumi Corporation" },
{ 928, "GE Multilin" },
{ 929, "Measurement Computing Corporation" },
{ 930, "Jetter AG" },
{ 931, "Tokyo Electronics Systems Corporation" },
{ 932, "Togami Electric Mfg. Co., Ltd." },
{ 933, "HK Systems" },
{ 934, "CDA Systems Ltd." },
{ 935, "Aerotech Inc." },
{ 936, "JVL Industrie Elektronik A/S" },
{ 937, "NovaTech Process Solutions LLC" },
{ 938, "Reserved" },
{ 939, "Cisco Systems" },
{ 940, "Grid Connect" },
{ 941, "ITW Automotive Finishing" },
{ 942, "HanYang System" },
{ 943, "ABB K.K. Technical Center" },
{ 944, "Taiyo Electric Wire & Cable Co., Ltd." },
{ 945, "Reserved" },
{ 946, "SEREN IPS INC" },
{ 947, "Belden CDT Electronics Division" },
{ 948, "ControlNet International" },
{ 949, "Gefran S.P.A." },
{ 950, "Jokab Safety AB" },
{ 951, "SUMITA OPTICAL GLASS, INC." },
{ 952, "Biffi Italia srl" },
{ 953, "Beck IPC GmbH" },
{ 954, "Copley Controls Corporation" },
{ 955, "Fagor Automation S. Coop." },
{ 956, "DARCOM" },
{ 957, "Frick Controls (div. of York International)" },
{ 958, "SymCom, Inc." },
{ 959, "Infranor" },
{ 960, "Kyosan Cable, Ltd." },
{ 961, "Varian Vacuum Technologies" },
{ 962, "Messung Systems" },
{ 963, "Xantrex Technology, Inc." },
{ 964, "StarThis Inc." },
{ 965, "Chiyoda Co., Ltd." },
{ 966, "Flowserve Corporation" },
{ 967, "Spyder Controls Corp." },
{ 968, "IBA AG" },
{ 969, "SHIMOHIRA ELECTRIC MFG.CO.,LTD" },
{ 970, "Reserved" },
{ 971, "Siemens L&A" },
{ 972, "Micro Innovations AG" },
{ 973, "Switchgear & Instrumentation" },
{ 974, "PRE-TECH CO., LTD." },
{ 975, "National Semiconductor" },
{ 976, "Invensys Process Systems" },
{ 977, "Ametek HDR Power Systems" },
{ 978, "Reserved" },
{ 979, "TETRA-K Corporation" },
{ 980, "C & M Corporation" },
{ 981, "Siempelkamp Maschinen" },
{ 982, "Reserved" },
{ 983, "Daifuku America Corporation" },
{ 984, "Electro-Matic Products Inc." },
{ 985, "BUSSAN MICROELECTRONICS CORP." },
{ 986, "ELAU AG" },
{ 987, "Hetronic USA" },
{ 988, "NIIGATA POWER SYSTEMS Co., Ltd." },
{ 989, "Software Horizons Inc." },
{ 990, "B3 Systems, Inc." },
{ 991, "Moxa Networking Co., Ltd." },
{ 992, "Reserved" },
{ 993, "S4 Integration" },
{ 994, "Elettro Stemi S.R.L." },
{ 995, "AquaSensors" },
{ 996, "Ifak System GmbH" },
{ 997, "SANKEI MANUFACTURING Co.,LTD." },
{ 998, "Emerson Network Power Co., Ltd." },
{ 999, "Fairmount Automation, Inc." },
{ 1000, "Bird Electronic Corporation" },
{ 1001, "Nabtesco Corporation" },
{ 1002, "AGM Electronics, Inc." },
{ 1003, "ARCX Inc." },
{ 1004, "DELTA I/O Co." },
{ 1005, "Chun IL Electric Ind. Co." },
{ 1006, "N-Tron" },
{ 1007, "Nippon Pneumatics/Fludics System CO.,LTD." },
{ 1008, "DDK Ltd." },
{ 1009, "Seiko Epson Corporation" },
{ 1010, "Halstrup-Walcher GmbH" },
{ 1011, "ITT" },
{ 1012, "Ground Fault Systems bv" },
{ 1013, "Scolari Engineering S.p.A." },
{ 1014, "Vialis Traffic bv" },
{ 1015, "Weidmueller Interface GmbH & Co. KG" },
{ 1016, "Shanghai Sibotech Automation Co. Ltd" },
{ 1017, "AEG Power Supply Systems GmbH" },
{ 1018, "Komatsu Electronics Inc." },
{ 1019, "Souriau" },
{ 1020, "Baumuller Chicago Corp." },
{ 1021, "J. Schmalz GmbH" },
{ 1022, "SEN Corporation" },
{ 1023, "Korenix Technology Co. Ltd" },
{ 1024, "Cooper Power Tools" },
{ 1025, "INNOBIS" },
{ 1026, "Shinho System" },
{ 1027, "Xm Services Ltd." },
{ 1028, "KVC Co., Ltd." },
{ 1029, "Sanyu Seiki Co., Ltd." },
{ 1030, "TuxPLC" },
{ 1031, "Northern Network Solutions" },
{ 1032, "Converteam GmbH" },
{ 1033, "Symbol Technologies" },
{ 1034, "S-TEAM Lab" },
{ 1035, "Maguire Products, Inc." },
{ 1036, "AC&T" },
{ 1037, "MITSUBISHI HEAVY INDUSTRIES, LTD. KOBE SHIPYARD & MACHINERY WORKS" },
{ 1038, "Hurletron Inc." },
{ 1039, "Chunichi Denshi Co., Ltd" },
{ 1040, "Cardinal Scale Mfg. Co." },
{ 1041, "BTR NETCOM via RIA Connect, Inc." },
{ 1042, "Base2" },
{ 1043, "ASRC Aerospace" },
{ 1044, "Beijing Stone Automation" },
{ 1045, "Changshu Switchgear Manufacture Ltd." },
{ 1046, "METRONIX Corp." },
{ 1047, "WIT" },
{ 1048, "ORMEC Systems Corp." },
{ 1049, "ASATech (China) Inc." },
{ 1050, "Controlled Systems Limited" },
{ 1051, "Mitsubishi Heavy Ind. Digital System Co., Ltd. (M.H.I.)" },
{ 1052, "Electrogrip" },
{ 1053, "TDS Automation" },
{ 1054, "T&C Power Conversion, Inc." },
{ 1055, "Robostar Co., Ltd" },
{ 1056, "Scancon A/S" },
{ 1057, "Haas Automation, Inc." },
{ 1058, "Eshed Technology" },
{ 1059, "Delta Electronic Inc." },
{ 1060, "Innovasic Semiconductor" },
{ 1061, "SoftDEL Systems Limited" },
{ 1062, "FiberFin, Inc." },
{ 1063, "Nicollet Technologies Corp." },
{ 1064, "B.F. Systems" },
{ 1065, "Empire Wire and Supply LLC" },
{ 1066, "Reserved" },
{ 1067, "Elmo Motion Control LTD" },
{ 1068, "Reserved" },
{ 1069, "Asahi Keiki Co., Ltd." },
{ 1070, "Joy Mining Machinery" },
{ 1071, "MPM Engineering Ltd" },
{ 1072, "Wolke Inks & Printers GmbH" },
{ 1073, "Mitsubishi Electric Engineering Co., Ltd." },
{ 1074, "COMET AG" },
{ 1075, "Real Time Objects & Systems, LLC" },
{ 1076, "MISCO Refractometer" },
{ 1077, "JT Engineering Inc." },
{ 1078, "Automated Packing Systems" },
{ 1079, "Niobrara R&D Corp." },
{ 1080, "Garmin Ltd." },
{ 1081, "Japan Mobile Platform Co., Ltd" },
{ 1082, "Advosol Inc." },
{ 1083, "ABB Global Services Limited" },
{ 1084, "Sciemetric Instruments Inc." },
{ 1085, "Tata Elxsi Ltd." },
{ 1086, "TPC Mechatronics, Co., Ltd." },
{ 1087, "Cooper Bussmann" },
{ 1088, "Trinite Automatisering B.V." },
{ 1089, "Peek Traffic B.V." },
{ 1090, "Acrison, Inc" },
{ 1091, "Applied Robotics, Inc." },
{ 1092, "FireBus Systems, Inc." },
{ 1093, "Beijing Sevenstar Huachuang Electronics" },
{ 1094, "Magnetek" },
{ 1095, "Microscan" },
{ 1096, "Air Water Inc." },
{ 1097, "Sensopart Industriesensorik GmbH" },
{ 1098, "Tiefenbach Control Systems GmbH" },
{ 1099, "INOXPA S.A" },
{ 1100, "Zurich University of Applied Sciences" },
{ 1101, "Ethernet Direct" },
{ 1102, "GSI-Micro-E Systems" },
{ 1103, "S-Net Automation Co., Ltd." },
{ 1104, "Power Electronics S.L." },
{ 1105, "Renesas Technology Corp." },
{ 1106, "NSWCCD-SSES" },
{ 1107, "Porter Engineering Ltd." },
{ 1108, "Meggitt Airdynamics, Inc." },
{ 1109, "Inductive Automation" },
{ 1110, "Neural ID" },
{ 1111, "EEPod LLC" },
{ 1112, "Hitachi Industrial Equipment Systems Co., Ltd." },
{ 1113, "Salem Automation" },
{ 1114, "port GmbH" },
{ 1115, "B & PLUS" },
{ 1116, "Graco Inc." },
{ 1117, "Altera Corporation" },
{ 1118, "Technology Brewing Corporation" },
{ 1121, "CSE Servelec" },
{ 1124, "Fluke Networks" },
{ 1125, "Tetra Pak Packaging Solutions SPA" },
{ 1126, "Racine Federated, Inc." },
{ 1127, "Pureron Japan Co., Ltd." },
{ 1130, "Brother Industries, Ltd." },
{ 1132, "Leroy Automation" },
{ 1134, "THK CO., LTD." },
{ 1137, "TR-Electronic GmbH" },
{ 1138, "ASCON S.p.A." },
{ 1139, "Toledo do Brasil Industria de Balancas Ltda." },
{ 1140, "Bucyrus DBT Europe GmbH" },
{ 1141, "Emerson Process Management Valve Automation" },
{ 1142, "Alstom Transport" },
{ 1144, "Matrox Electronic Systems" },
{ 1145, "Littelfuse" },
{ 1146, "PLASMART, Inc." },
{ 1147, "Miyachi Corporation" },
{ 1150, "Promess Incorporated" },
{ 1151, "COPA-DATA GmbH" },
{ 1152, "Precision Engine Controls Corporation" },
{ 1153, "Alga Automacao e controle LTDA" },
{ 1154, "U.I. Lapp GmbH" },
{ 1155, "ICES" },
{ 1156, "Philips Lighting bv" },
{ 1157, "Aseptomag AG" },
{ 1158, "ARC Informatique" },
{ 1159, "Hesmor GmbH" },
{ 1160, "Kobe Steel, Ltd." },
{ 1161, "FLIR Systems" },
{ 1162, "Simcon A/S" },
{ 1163, "COPALP" },
{ 1164, "Zypcom, Inc." },
{ 1165, "Swagelok" },
{ 1166, "Elspec" },
{ 1167, "ITT Water & Wastewater AB" },
{ 1168, "Kunbus GmbH Industrial Communication" },
{ 1170, "Performance Controls, Inc." },
{ 1171, "ACS Motion Control, Ltd." },
{ 1173, "IStar Technology Limited" },
{ 1174, "Alicat Scientific, Inc." },
{ 1176, "ADFweb.com SRL" },
{ 1177, "Tata Consultancy Services Limited" },
{ 1178, "CXR Ltd." },
{ 1179, "Vishay Nobel AB" },
{ 1181, "SolaHD" },
{ 1182, "Endress+Hauser" },
{ 1183, "Bartec GmbH" },
{ 1185, "AccuSentry, Inc." },
{ 1186, "Exlar Corporation" },
{ 1187, "ILS Technology" },
{ 1188, "Control Concepts Inc." },
{ 1190, "Procon Engineering Limited" },
{ 1191, "Hermary Opto Electronics Inc." },
{ 1192, "Q-Lambda" },
{ 1194, "VAMP Ltd" },
{ 1195, "FlexLink" },
{ 1196, "Office FA.com Co., Ltd." },
{ 1197, "SPMC (Changzhou) Co. Ltd." },
{ 1198, "Anton Paar GmbH" },
{ 1199, "Zhuzhou CSR Times Electric Co., Ltd." },
{ 1200, "DeStaCo" },
{ 1201, "Synrad, Inc" },
{ 1202, "Bonfiglioli Vectron GmbH" },
{ 1203, "Pivotal Systems" },
{ 1204, "TKSCT" },
{ 1205, "Randy Nuernberger" },
{ 1206, "CENTRALP" },
{ 1207, "Tengen Group" },
{ 1208, "OES, Inc." },
{ 1209, "Actel Corporation" },
{ 1210, "Monaghan Engineering, Inc." },
{ 1211, "wenglor sensoric gmbh" },
{ 1212, "HSA Systems" },
{ 1213, "MK Precision Co., Ltd." },
{ 1214, "Tappan Wire and Cable" },
{ 1215, "Heinzmann GmbH & Co. KG" },
{ 1216, "Process Automation International Ltd." },
{ 1217, "Secure Crossing" },
{ 1218, "SMA Railway Technology GmbH" },
{ 1219, "FMS Force Measuring Systems AG" },
{ 1220, "ABT Endustri Enerji Sistemleri Sanayi Tic. Ltd. Sti." },
{ 1221, "MagneMotion Inc." },
{ 1222, "STS Co., Ltd." },
{ 1223, "MERAK SIC, SA" },
{ 1224, "ABOUNDI, Inc." },
{ 1225, "Rosemount Inc." },
{ 1226, "GEA FES, Inc." },
{ 1227, "TMG Technologie und Engineering GmbH" },
{ 1228, "embeX GmbH" },
{ 1229, "GH Electrotermia, S.A." },
{ 1230, "Tolomatic" },
{ 1231, "Dukane" },
{ 1232, "Elco (Tian Jin) Electronics Co., Ltd." },
{ 1233, "Jacobs Automation" },
{ 1234, "Noda Radio Frequency Technologies Co., Ltd." },
{ 1235, "MSC Tuttlingen GmbH" },
{ 1236, "Hitachi Cable Manchester" },
{ 1237, "ACOREL SAS" },
{ 1238, "Global Engineering Solutions Co., Ltd." },
{ 1239, "ALTE Transportation, S.L." },
{ 1240, "Penko Engineering B.V." },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
value_string_ext cip_vendor_vals_ext = VALUE_STRING_EXT_INIT(cip_vendor_vals);
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
/* Translate Device Profile's */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static const value_string cip_devtype_vals[] = {
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
{ 0x00, "Generic Device (deprecated)" },
{ 0x02, "AC Drive" },
{ 0x03, "Motor Overload" },
{ 0x04, "Limit Switch" },
{ 0x05, "Inductive Proximity Switch" },
{ 0x06, "Photoelectric Sensor" },
{ 0x07, "General Purpose Discrete I/O" },
{ 0x09, "Resolver" },
{ 0x0C, "Communications Adapter" },
{ 0x0E, "Programmable Logic Controller" },
{ 0x10, "Position Controller", },
{ 0x13, "DC Drive" },
{ 0x15, "Contactor", },
{ 0x16, "Motor Starter", },
{ 0x17, "Soft Start", },
{ 0x18, "Human-Machine Interface" },
{ 0x1A, "Mass Flow Controller" },
{ 0x1B, "Pneumatic Valve" },
{ 0x1C, "Vacuum Pressure Gauge" },
{ 0x1D, "Process Control Value" },
{ 0x1E, "Residual Gas Analyzer" },
{ 0x1F, "DC Power Generator" },
{ 0x20, "RF Power Generator" },
{ 0x21, "Turbomolecular Vacuum Pump" },
{ 0x22, "Encoder" },
{ 0x23, "Safety Discrete I/O Device" },
{ 0x24, "Fluid Flow Controller" },
{ 0x25, "CIP Motion Drive" },
{ 0x26, "CompoNet Repeater" },
{ 0x27, "Mass Flow Controller, Enhanced" },
{ 0x28, "CIP Modbus Device" },
{ 0x29, "CIP Modbus Translator" },
{ 0x2A, "Safety Analog I/O Device" },
{ 0x2B, "Generic Device (keyable)" },
{ 0x2C, "Managed Switch" },
{ 0x32, "ControlNet Physical Layer Component" },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{ 0, NULL }
};
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
value_string_ext cip_devtype_vals_ext = VALUE_STRING_EXT_INIT(cip_devtype_vals);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Translate class names */
static const value_string cip_class_names_vals[] = {
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
{ 0x01, "Identity" },
{ 0x02, "Message Router" },
{ 0x03, "DeviceNet" },
{ 0x04, "Assembly" },
{ 0x05, "Connection" },
{ 0x06, "Connection Manager" },
{ 0x07, "Register" },
{ 0x08, "Discrete Input Point" },
{ 0x09, "Discrete Output Point" },
{ 0x0A, "Analog Input Point" },
{ 0x0B, "Analog Output Point" },
{ 0x0E, "Presence Sensing" },
{ 0x0F, "Parameter" },
{ 0x10, "Parameter Group" },
{ 0x12, "Group" },
{ 0x1D, "Discrete Input Group" },
{ 0x1E, "Discrete Output Group" },
{ 0x1F, "Discrete Group" },
{ 0x20, "Analog Input Group" },
{ 0x21, "Analog Output Group" },
{ 0x22, "Analog Group" },
{ 0x23, "Position Sensor" },
{ 0x24, "Position Controller Supervisor" },
{ 0x25, "Position Controller" },
{ 0x26, "Block Sequencer" },
{ 0x27, "Command Block" },
{ 0x28, "Motor Data" },
{ 0x29, "Control Supervisor" },
{ 0x2A, "AC/DC Drive" },
{ 0x2B, "Acknowledge Handler" },
{ 0x2C, "Overload" },
{ 0x2D, "Softstart" },
{ 0x2E, "Selection" },
{ 0x30, "S-Device Supervisor" },
{ 0x31, "S-Analog Sensor" },
{ 0x32, "S-Analog Actuator" },
{ 0x33, "S-Single Stage Controller" },
{ 0x34, "S-Gas Calibration" },
{ 0x35, "Trip Point" },
{ 0x37, "File" },
{ 0x38, "S-Partial Pressure" },
{ 0x39, "Safety Supervisor" },
{ 0x3A, "Safety Validator" },
{ 0x3B, "Safety Discrete Output Point" },
{ 0x3C, "Safety Discrete Output Group" },
{ 0x3D, "Safety Discrete Input Point" },
{ 0x3E, "Safety Discrete Input Group" },
{ 0x3F, "Safety Dual Channel Output" },
{ 0x40, "S-Sensor Calibration" },
{ 0x41, "Event Log" },
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{ 0x42, "Motion Device Axis" },
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
{ 0x43, "Time Sync" },
{ 0x44, "Modbus" },
{ 0x45, "Originator Connection List" },
{ 0x46, "Modbus Serial Link" },
{ 0x47, "Device Level Ring (DLR)" },
{ 0x48, "QoS" },
{ 0x49, "Safety Analog Input Point" },
{ 0x4A, "Safety Analog Input Group" },
{ 0x4B, "Safety Dual Channel Analog Input" },
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{ 0x4C, "SERCOS III Link" },
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
{ 0x4D, "Target Connection List" },
{ 0x4E, "Base Energy" },
{ 0x4F, "Electrical Energy" },
{ 0x50, "Non-Electrical Energy" },
{ 0x51, "Base Switch" },
{ 0x52, "SNMP" },
{ 0x53, "Power Management" },
{ 0x54, "RSTP Bridge" },
{ 0x55, "RSTP Port" },
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{ 0x56, "PRP/HSR Protocol" },
{ 0x57, "PRP/HSR Nodes Table" },
{ 0x58, "Safety Feedback" },
{ 0x59, "Safety Dual Channel Feedback" },
{ 0x5A, "Safety Stop Functions" },
{ 0x5B, "Safety Limit Functions" },
{ 0x5C, "Power Curtailment" },
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
{ 0x5D, "CIP Security" },
{ 0x5E, "EtherNet/IP Security" },
{ 0x5F, "Certificate Management" },
{ 0xF0, "ControlNet" },
{ 0xF1, "ControlNet Keeper" },
{ 0xF2, "ControlNet Scheduling" },
{ 0xF3, "Connection Configuration" },
{ 0xF4, "Port" },
{ 0xF5, "TCP/IP Interface" },
{ 0xF6, "Ethernet Link" },
{ 0xF7, "CompoNet" },
{ 0xF8, "CompoNet Repeater" },
{ 0, NULL }
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
};
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
const value_string cip_id_state_vals[] = {
{ 0, "Nonexistent" },
{ 1, "Device Self Testing" },
{ 2, "Standby" },
{ 3, "Operational" },
{ 4, "Major Recoverable Fault" },
{ 5, "Major Unrecoverable Fault" },
{ 0, NULL }
};
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
const range_string cip_port_type_vals[] = {
{ 0, 0, "Any - no routing" },
{ 1, 1, "Reserved for legacy use" },
{ 2, 2, "ControlNet" },
{ 3, 3, "ControlNet with redundancy" },
{ 4, 4, "EtherNet/IP" },
{ 5, 5, "DeviceNet" },
{ 6, 99, "Reserved for legacy use" },
{ 100, 199, "Vendor Specific" },
{ 200, 200, "CompoNet" },
{ 201, 201, "Modbus/TCP" },
{ 202, 202, "Modbus/SL" },
{ 203, 203, "SERCOS III" },
{ 204, 65534, "Reserved for future use" },
{ 65535, 65535, "Any - user configurable" },
{ 0, 0, NULL }
};
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
value_string_ext cip_class_names_vals_ext = VALUE_STRING_EXT_INIT(cip_class_names_vals);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
static void add_cip_class_to_info_column(packet_info *pinfo, guint32 class_id, int display_type)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
cip_req_info_t *cip_req_info;
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
CIP: Cleanup info column for MSP packets 1. Skip printing class name in info column when it was an MSP, since it's implied. 2. Don't print response status for embedded messages in info column for MSP. It makes the line too long. 3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed. Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd Reviewed-on: https://code.wireshark.org/review/16162 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27 02:34:03 +00:00
/* Skip printing the top level class for certain common messages because it gets
too wordy in the Info column. */
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
cip_req_info = (cip_req_info_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
if (cip_req_info
CIP: Cleanup info column for MSP packets 1. Skip printing class name in info column when it was an MSP, since it's implied. 2. Don't print response status for embedded messages in info column for MSP. It makes the line too long. 3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed. Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd Reviewed-on: https://code.wireshark.org/review/16162 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27 02:34:03 +00:00
&& ((cip_req_info->bService == SC_CM_UNCON_SEND && class_id == CI_CLS_CM)
|| (cip_req_info->bService == SC_MULT_SERV_PACK && class_id == CI_CLS_MR)))
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
{
return;
}
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
if (display_type == DISPLAY_CONNECTION_PATH)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", val_to_str(class_id, cip_class_names_vals, "Class (0x%02x)"));
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
}
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
else if (display_type == DISPLAY_REQUEST_PATH)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, "%s - ", val_to_str(class_id, cip_class_names_vals, "Class (0x%02x)"));
}
}
static void add_cip_symbol_to_info_column(packet_info *pinfo, gchar *symbol_name, int display_type)
{
if (symbol_name == NULL)
{
return;
}
if (display_type == DISPLAY_CONNECTION_PATH)
{
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, " ('%s')", symbol_name);
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
}
else if (display_type == DISPLAY_REQUEST_PATH)
{
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, "'%s' - ", symbol_name);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
}
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
void add_cip_service_to_info_column(packet_info *pinfo, guint8 service, const value_string* service_vals)
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
{
col_append_str( pinfo->cinfo, COL_INFO,
val_to_str(service & CIP_SC_MASK, service_vals, "Service (0x%02x)"));
col_set_fence(pinfo->cinfo, COL_INFO);
}
Mark some function static. svn path=/trunk/; revision=41999
2012-04-09 19:43:19 +00:00
static int dissect_id_revision(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int offset, int total_len)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (total_len < 2)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_identity_revision);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return total_len;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( tree, hf_id_major_rev, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_id_minor_rev, tvb, offset+1, 1, ENC_LITTLE_ENDIAN);
return 2;
}
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static int dissect_id_status(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
static const int * status[] = {
&hf_id_status_owned,
&hf_id_status_conf,
&hf_id_status_extended1,
&hf_id_status_minor_fault_rec,
&hf_id_status_minor_fault_unrec,
&hf_id_status_major_fault_rec,
&hf_id_status_major_fault_unrec,
&hf_id_status_extended2,
NULL
};
if (total_len < 2)
{
expert_add_info(pinfo, item, &ei_mal_identity_status);
return total_len;
}
proto_tree_add_bitmask(tree, tvb, offset, hf_id_status, ett_id_status, status, ENC_LITTLE_ENDIAN);
return 2;
}
Fix more -Wused-but-marked-unused warnings/errors. Change-Id: Ieb3e70a23c1a55b7ba60b1b32f159341adfe65b7 Reviewed-on: https://code.wireshark.org/review/14682 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-03-28 19:02:17 +00:00
static int dissect_msg_rout_num_classes(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
guint16 i, num_classes;
num_classes = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_msg_rout_num_classes, tvb, offset, 2, ENC_LITTLE_ENDIAN);
if (total_len < (2+(num_classes*2)))
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_msg_rout_num_classes);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return total_len;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
for (i = 0; i < num_classes; i++)
proto_tree_add_item( tree, hf_msg_rout_classes, tvb, offset+2+(i*2), 2, ENC_LITTLE_ENDIAN);
return (2+(num_classes*2));
}
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
static int dissect_cm_connection_entry_list(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb,
int offset, int total_len _U_)
{
guint32 num_conn_entries = 0;
guint32 num_conn_entries_bytes;
proto_tree_add_item_ret_uint(tree, hf_conn_mgr_num_conn_entries, tvb, offset, 2, ENC_LITTLE_ENDIAN, &num_conn_entries);
num_conn_entries_bytes = (num_conn_entries+7)/8;
proto_tree_add_uint(tree, hf_conn_mgr_num_conn_entries_bytes, tvb, 0, 0, num_conn_entries_bytes);
for (guint32 i = 0; i < num_conn_entries_bytes; i++)
{
proto_tree_add_item(tree, hf_conn_mgr_conn_open_bits, tvb, offset + 2 + i, 1, ENC_LITTLE_ENDIAN);
}
return 2 + num_conn_entries_bytes;
}
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
static int dissect_time_sync_grandmaster_clock(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
proto_item* ti;
proto_tree* flag_tree;
if (total_len < 24)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_gm_clock);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_gm_clock_clock_id, tvb, offset, 8, ENC_NA);
proto_tree_add_item( tree, hf_time_sync_gm_clock_clock_class, tvb, offset+8, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_gm_clock_time_accuracy, tvb, offset+10, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_gm_clock_offset_scaled_log_variance, tvb, offset+12, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_gm_clock_current_utc_offset, tvb, offset+14, 2, ENC_LITTLE_ENDIAN);
ti = proto_tree_add_item( tree, hf_time_sync_gm_clock_time_property_flags, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
flag_tree = proto_item_add_subtree(ti, ett_time_sync_gm_clock_flags);
proto_tree_add_item( flag_tree, hf_time_sync_gm_clock_time_property_flags_leap61, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_gm_clock_time_property_flags_leap59, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_gm_clock_time_property_flags_current_utc_valid, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_gm_clock_time_property_flags_ptp_timescale, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_gm_clock_time_property_flags_time_traceable, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_gm_clock_time_property_flags_freq_traceable, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_gm_clock_time_source, tvb, offset+18, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_gm_clock_priority1, tvb, offset+20, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_gm_clock_priority2, tvb, offset+22, 2, ENC_LITTLE_ENDIAN);
return 24;
}
static int dissect_time_sync_parent_clock(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
if (total_len < 16)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_parent_clock);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_parent_clock_clock_id, tvb, offset, 8, ENC_NA);
proto_tree_add_item( tree, hf_time_sync_parent_clock_port_number, tvb, offset+8, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_parent_clock_observed_offset_scaled_log_variance, tvb, offset+10, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_parent_clock_observed_phase_change_rate, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
return 16;
}
static int dissect_time_sync_local_clock(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
proto_item* ti;
proto_tree* flag_tree;
if (total_len < 20)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_local_clock);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_local_clock_clock_id, tvb, offset, 8, ENC_NA);
proto_tree_add_item( tree, hf_time_sync_local_clock_clock_class, tvb, offset+8, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_local_clock_time_accuracy, tvb, offset+10, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_local_clock_offset_scaled_log_variance, tvb, offset+12, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_local_clock_current_utc_offset, tvb, offset+14, 2, ENC_LITTLE_ENDIAN);
ti = proto_tree_add_item( tree, hf_time_sync_local_clock_time_property_flags, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
flag_tree = proto_item_add_subtree(ti, ett_time_sync_local_clock_flags);
proto_tree_add_item( flag_tree, hf_time_sync_local_clock_time_property_flags_leap61, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_local_clock_time_property_flags_leap59, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_local_clock_time_property_flags_current_utc_valid, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_local_clock_time_property_flags_ptp_timescale, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_local_clock_time_property_flags_time_traceable, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_local_clock_time_property_flags_freq_traceable, tvb, offset+16, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_local_clock_time_source, tvb, offset+18, 2, ENC_LITTLE_ENDIAN);
return 20;
}
static int dissect_time_sync_port_state_info(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint16 i, num_ports;
proto_tree* port_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_state_info);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
num_ports = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_port_state_info_num_ports, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if (2+num_ports*4 > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_state_info_ports);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
for (i = 0; i < num_ports; i++)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*4, 4, ett_time_sync_port_state_info, NULL, "Port #%d", i+1);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_state_info_port_state, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
}
return 2+num_ports*4;
}
static int dissect_time_sync_port_enable_cfg(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint16 i, num_ports;
proto_tree* port_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_enable_cfg);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
num_ports = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_port_enable_cfg_num_ports, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if (2+num_ports*4 > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_enable_cfg_ports);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
for (i = 0; i < num_ports; i++)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*4, 4, ett_time_sync_port_enable_cfg, NULL, "Port #%d", i+1);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_enable_cfg_port_enable, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
}
return 2+num_ports*4;
}
static int dissect_time_sync_port_log_announce(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint16 i, num_ports;
proto_tree* port_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_log_announce);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
num_ports = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_port_log_announce_num_ports, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if (2+num_ports*4 > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_log_announce_ports);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
for (i = 0; i < num_ports; i++)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*4, 4, ett_time_sync_port_log_announce, NULL, "Port #%d", i+1);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_log_announce_interval, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
}
return 2+num_ports*4;
}
static int dissect_time_sync_port_log_sync(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint16 i, num_ports;
proto_tree* port_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_log_sync);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
num_ports = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_port_log_sync_num_ports, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if (2+num_ports*4 > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_log_sync_ports);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
for (i = 0; i < num_ports; i++)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*4, 4, ett_time_sync_port_log_sync, NULL, "Port #%d", i+1);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_num, tvb, offset+2+i*4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_log_sync_port_log_sync_interval, tvb, offset+4+i*4, 2, ENC_LITTLE_ENDIAN);
}
return 2+num_ports*4;
}
static int dissect_time_sync_clock_type(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
proto_item* ti;
proto_tree* flag_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_clock_type);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
ti = proto_tree_add_item( tree, hf_time_sync_clock_type, tvb, offset, 2, ENC_LITTLE_ENDIAN);
flag_tree = proto_item_add_subtree(ti, ett_time_sync_clock_type);
proto_tree_add_item( flag_tree, hf_time_sync_clock_type_management, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_clock_type_end_to_end, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_clock_type_boundary, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_clock_type_ordinary, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( flag_tree, hf_time_sync_clock_type_slave_only, tvb, offset, 2, ENC_LITTLE_ENDIAN);
return 2;
}
static int dissect_time_sync_manufacture_id(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
if (total_len < 4)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_manufacture_id);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_manufacture_id_oui, tvb, offset, 3, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_manufacture_id_reserved, tvb, offset+3, 1, ENC_LITTLE_ENDIAN);
return 4;
}
static int dissect_time_sync_prod_desc(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint32 size;
if (total_len < 4)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_prod_desc);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
size = tvb_get_letohl( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_prod_desc_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
if (size > 64)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_prod_desc_64);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if ((int)(size+4) > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_prod_desc_size);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_prod_desc_str, tvb, offset+4, size, ENC_ASCII|ENC_NA);
return size+4;
}
static int dissect_time_sync_revision_data(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint32 size;
if (total_len < 4)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_revision_data);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
size = tvb_get_letohl( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_revision_data_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
if (size > 32)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_revision_data_32);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if ((int)(size+4) > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_revision_data_size);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_revision_data_str, tvb, offset+4, size, ENC_ASCII|ENC_NA);
return size+4;
}
static int dissect_time_sync_user_desc(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint32 size;
if (total_len < 4)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_user_desc);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
size = tvb_get_letohl( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_user_desc_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
if (size > 128)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_user_desc_128);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if ((int)(size+4) > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_user_desc_size);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_user_desc_str, tvb, offset+4, size, ENC_ASCII|ENC_NA);
return size+4;
}
static int dissect_time_sync_port_profile_id_info(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint16 i, num_ports;
proto_tree* port_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_profile_id_info);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
num_ports = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_port_profile_id_info_num_ports, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if (2+num_ports*10 > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_profile_id_info_ports);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
for (i = 0; i < num_ports; i++)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*10, 10, ett_time_sync_port_profile_id_info, NULL, "Port #%d", i+1);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_port_num, tvb, offset+2+i*10, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_profile_id_info_profile_id, tvb, offset+4+i*10, 8, ENC_NA);
}
return 2+num_ports*10;
}
static int dissect_time_sync_port_phys_addr_info(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint16 i, num_ports;
proto_tree* port_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_phys_addr_info);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
num_ports = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_port_phys_addr_info_num_ports, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if (2+num_ports*36 > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_phys_addr_info_ports);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
for (i = 0; i < num_ports; i++)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*36, 36, ett_time_sync_port_phys_addr_info, NULL, "Port #%d", i+1);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_port_num, tvb, offset+2+i*36, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_phys_proto, tvb, offset+4+i*36, 16, ENC_NA);
proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_addr_size, tvb, offset+20+i*36, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_phys_addr_info_phys_proto, tvb, offset+22+i*36, 16, ENC_NA);
}
return 2+num_ports*36;
}
static int dissect_time_sync_port_proto_addr_info(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
guint16 i, num_ports;
proto_tree* port_tree;
if (total_len < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_proto_addr_info);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
num_ports = tvb_get_letohs( tvb, offset);
proto_tree_add_item( tree, hf_time_sync_port_proto_addr_info_num_ports, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
if (2+num_ports*22 > total_len)
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_port_proto_addr_info_ports);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
for (i = 0; i < num_ports; i++)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
port_tree = proto_tree_add_subtree_format(tree, tvb, offset+2+i*22, 22, ett_time_sync_port_proto_addr_info, NULL, "Port #%d", i+1);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_port_num, tvb, offset+2+i*22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_network_proto, tvb, offset+4+i*22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_addr_size, tvb, offset+6+i*22, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(port_tree, hf_time_sync_port_proto_addr_info_port_proto_addr, tvb, offset+8+i*22, 16, ENC_NA);
}
return 2+num_ports*22;
}
static int dissect_time_sync_sys_time_and_offset(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
if (total_len < 16)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_time_sync_sys_time_and_offset);
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
return total_len;
}
proto_tree_add_item( tree, hf_time_sync_sys_time_and_offset_time, tvb, offset, 8, ENC_LITTLE_ENDIAN);
proto_tree_add_item( tree, hf_time_sync_sys_time_and_offset_offset, tvb, offset+8, 8, ENC_LITTLE_ENDIAN);
return 16;
}
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
int dissect_optional_attr_list(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
CIP: Add support for common class attributes Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2 Reviewed-on: https://code.wireshark.org/review/12502 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>
2015-12-10 16:39:46 +00:00
int offset, int total_len)
{
guint32 i;
guint32 num_attr = 0;
proto_tree_add_item_ret_uint(tree, hf_attr_class_opt_attr_num, tvb, offset, 2, ENC_LITTLE_ENDIAN, &num_attr);
if (total_len < (int)(2 + num_attr * 2))
{
expert_add_info(pinfo, item, &ei_mal_opt_attr_list);
return total_len;
}
for (i = 0; i < num_attr; ++i)
{
proto_tree_add_item(tree, hf_attr_class_attr_num, tvb, offset + 2 + 2 * i, 2, ENC_LITTLE_ENDIAN);
}
return 2 + num_attr * 2;
}
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
int dissect_optional_service_list(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
CIP: Add support for common class attributes Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2 Reviewed-on: https://code.wireshark.org/review/12502 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>
2015-12-10 16:39:46 +00:00
int offset, int total_len)
{
guint32 i;
guint32 num_services = 0;
proto_tree_add_item_ret_uint(tree, hf_attr_class_opt_service_num, tvb, offset, 2, ENC_LITTLE_ENDIAN, &num_services);
if (total_len < (int)(2 + num_services * 2))
{
expert_add_info(pinfo, item, &ei_mal_opt_service_list);
return total_len;
}
for (i = 0; i < num_services; ++i)
{
proto_tree_add_item(tree, hf_attr_class_service_code, tvb, offset + 2 + 2 * i, 2, ENC_LITTLE_ENDIAN);
}
return 2 + num_services * 2;
}
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
static int dissect_port_instance_info(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb,
int offset, int total_len)
{
int i;
for (i = 0; i < total_len; i += 4)
{
proto_tree_add_item(tree, hf_port_type, tvb, offset + i, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_port_number, tvb, offset + i + 2, 2, ENC_LITTLE_ENDIAN);
}
return total_len;
}
static int dissect_padded_epath_len(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len, gboolean one_byte_len)
{
guint32 path_size;
proto_tree *epath_tree;
proto_item *path_item;
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
guint32 path_size_len;
int hf_path_len;
if (one_byte_len == TRUE)
{
path_size_len = 1;
hf_path_len = hf_path_len_usint;
}
else
{
path_size_len = 2;
hf_path_len = hf_path_len_uint;
}
path_item = proto_tree_add_item_ret_uint(tree, hf_path_len, tvb, offset, path_size_len, ENC_LITTLE_ENDIAN, &path_size);
if (total_len < (int)(path_size * 2 + path_size_len))
{
expert_add_info(pinfo, item, &ei_mal_padded_epath_size);
return total_len;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
epath_tree = proto_tree_add_subtree(tree, tvb, offset + path_size_len, path_size * 2, ett_path, &path_item, "Path: ");
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvb, pinfo, epath_tree, path_item, offset + path_size_len, path_size * 2, FALSE, FALSE, NULL, NULL, NO_DISPLAY, NULL, FALSE);
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
return path_size * 2 + path_size_len;
}
/* Format: USINT (Length of EPATH in 16-bit words) + Padded EPATH */
int dissect_padded_epath_len_usint(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
return dissect_padded_epath_len(pinfo, tree, item, tvb, offset, total_len, TRUE);
}
/* Format: UINT (Length of EPATH in 16-bit words) + Padded EPATH */
int dissect_padded_epath_len_uint(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
return dissect_padded_epath_len(pinfo, tree, item, tvb, offset, total_len, FALSE);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
static int dissect_single_segment_packed_attr(packet_info *pinfo, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb,
int offset, int total_len _U_)
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
proto_tree *subtree;
proto_item *subitem;
subtree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_port_path, &subitem, "Path: ");
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return dissect_cip_segment_single(pinfo, tvb, offset, 0, subtree, subitem, FALSE, TRUE, NULL, NULL, NO_DISPLAY, NULL, FALSE);
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
static int dissect_single_segment_padded_attr(packet_info *pinfo, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb,
int offset, int total_len _U_)
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
proto_tree *subtree;
proto_item *subitem;
subtree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_port_path, &subitem, "Path: ");
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return dissect_cip_segment_single(pinfo, tvb, offset, 0, subtree, subitem, FALSE, FALSE, NULL, NULL, NO_DISPLAY, NULL, FALSE);
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
}
static int dissect_port_link_object(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
int offset, int total_len)
{
return dissect_padded_epath_len_uint(pinfo, tree, item, tvb, offset, total_len);
}
static int dissect_port_node_range(packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, tvbuff_t *tvb,
int offset, int total_len _U_)
{
proto_tree_add_item(tree, hf_port_min_node_num, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_port_max_node_num, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN);
return 4;
}
static attribute_info_t cip_attribute_vals[] = {
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
/* Identity Object (class attributes) */
{0x01, TRUE, 1, 0, CLASS_ATTRIBUTE_1_NAME, cip_uint, &hf_attr_class_revision, NULL },
{0x01, TRUE, 2, 1, CLASS_ATTRIBUTE_2_NAME, cip_uint, &hf_attr_class_max_instance, NULL },
{0x01, TRUE, 3, -1, CLASS_ATTRIBUTE_3_NAME, cip_uint, &hf_attr_class_num_instance, NULL },
{0x01, TRUE, 4, -1, CLASS_ATTRIBUTE_4_NAME, cip_dissector_func, NULL, dissect_optional_attr_list },
{0x01, TRUE, 5, -1, CLASS_ATTRIBUTE_5_NAME, cip_dissector_func, NULL, dissect_optional_service_list },
{0x01, TRUE, 6, 2, CLASS_ATTRIBUTE_6_NAME, cip_uint, &hf_attr_class_num_class_attr, NULL },
{0x01, TRUE, 7, 3, CLASS_ATTRIBUTE_7_NAME, cip_uint, &hf_attr_class_num_inst_attr, NULL },
/* Identity Object (instance attributes) */
{0x01, FALSE, 1, 0, "Vendor ID", cip_uint, &hf_id_vendor_id, NULL},
{0x01, FALSE, 2, 1, "Device Type", cip_uint, &hf_id_device_type, NULL},
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{0x01, FALSE, 3, 2, "Product Code", cip_uint, &hf_id_product_code, NULL},
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
{0x01, FALSE, 4, 3, "Revision", cip_dissector_func, NULL, dissect_id_revision},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{0x01, FALSE, 5, 4, "Status", cip_dissector_func, NULL, dissect_id_status},
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
{0x01, FALSE, 6, 5, "Serial Number", cip_udint, &hf_id_serial_number, NULL},
{0x01, FALSE, 7, 6, "Product Name", cip_short_string, &hf_id_product_name, NULL},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{0x01, FALSE, 8, 7, "State", cip_usint, &hf_id_state, NULL},
{0x01, FALSE, 9, 8, "Configuration Consistency Value", cip_uint, &hf_id_config_value, NULL},
{0x01, FALSE, 10, 9, "Heartbeat Interval", cip_usint, &hf_id_heartbeat, NULL},
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
/* Message Router Object (class attributes) */
{0x02, TRUE, 1, 0, CLASS_ATTRIBUTE_1_NAME, cip_uint, &hf_attr_class_revision, NULL },
{0x02, TRUE, 2, -1, CLASS_ATTRIBUTE_2_NAME, cip_uint, &hf_attr_class_max_instance, NULL },
{0x02, TRUE, 3, -1, CLASS_ATTRIBUTE_3_NAME, cip_uint, &hf_attr_class_num_instance, NULL },
{0x02, TRUE, 4, 1, CLASS_ATTRIBUTE_4_NAME, cip_dissector_func, NULL, dissect_optional_attr_list },
{0x02, TRUE, 5, 2, CLASS_ATTRIBUTE_5_NAME, cip_dissector_func, NULL, dissect_optional_service_list },
{0x02, TRUE, 6, 3, CLASS_ATTRIBUTE_6_NAME, cip_uint, &hf_attr_class_num_class_attr, NULL },
{0x02, TRUE, 7, 4, CLASS_ATTRIBUTE_7_NAME, cip_uint, &hf_attr_class_num_inst_attr, NULL },
/* Message Router Object (instance attributes) */
{0x02, FALSE, 1, 0, "Object List", cip_dissector_func, NULL, dissect_msg_rout_num_classes},
{0x02, FALSE, 2, 1, "Number Available", cip_uint, &hf_msg_rout_num_available, NULL},
{0x02, FALSE, 3, 2, "Number Active", cip_uint, &hf_msg_rout_num_active, NULL},
{0x02, FALSE, 4, 3, "Active Connections", cip_uint_array, &hf_msg_rout_active_connections, NULL},
/* Connection Manager Object (class attributes) */
{0x06, TRUE, 1, 0, CLASS_ATTRIBUTE_1_NAME, cip_uint, &hf_attr_class_revision, NULL },
{0x06, TRUE, 2, 1, CLASS_ATTRIBUTE_2_NAME, cip_uint, &hf_attr_class_max_instance, NULL },
{0x06, TRUE, 3, -1, CLASS_ATTRIBUTE_3_NAME, cip_uint, &hf_attr_class_num_instance, NULL },
{0x06, TRUE, 4, -1, CLASS_ATTRIBUTE_4_NAME, cip_dissector_func, NULL, dissect_optional_attr_list },
{0x06, TRUE, 5, -1, CLASS_ATTRIBUTE_5_NAME, cip_dissector_func, NULL, dissect_optional_service_list },
{0x06, TRUE, 6, 2, CLASS_ATTRIBUTE_6_NAME, cip_uint, &hf_attr_class_num_class_attr, NULL },
{0x06, TRUE, 7, 3, CLASS_ATTRIBUTE_7_NAME, cip_uint, &hf_attr_class_num_inst_attr, NULL },
/* Connection Manager Object (instance attributes) */
{0x06, FALSE, 1, 0, "Open Requests", cip_uint, &hf_conn_mgr_open_requests, NULL},
{0x06, FALSE, 2, 1, "Open Format Rejects", cip_uint, &hf_conn_mgr_open_format_rejects, NULL},
{0x06, FALSE, 3, 2, "Open Resource Rejects", cip_uint, &hf_conn_mgr_open_resource_rejects, NULL},
{0x06, FALSE, 4, 3, "Other Open Rejects", cip_uint, &hf_conn_mgr_other_open_rejects, NULL},
{0x06, FALSE, 5, 4, "Close Requests", cip_uint, &hf_conn_mgr_close_requests, NULL},
{0x06, FALSE, 6, 5, "Close Format Requests", cip_uint, &hf_conn_close_format_requests, NULL},
{0x06, FALSE, 7, 6, "Close Other Requests", cip_uint, &hf_conn_mgr_close_other_requests, NULL},
{0x06, FALSE, 8, 7, "Connection Timeouts", cip_uint, &hf_conn_mgr_conn_timouts, NULL},
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{0x06, FALSE, 9, 8, "Connection Entry List", cip_dissector_func, NULL, dissect_cm_connection_entry_list },
{0x06, FALSE, 11, 9, "CPU Utilization", cip_uint, &hf_conn_mgr_cpu_utilization, NULL },
{0x06, FALSE, 12, 10, "Max Buff Size", cip_udint, &hf_conn_mgr_max_buff_size, NULL },
{0x06, FALSE, 13, 11, "Buff Size Remaining", cip_udint, &hf_conn_mgr_buff_size_remaining, NULL },
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
/* File Object (instance attributes) */
{0x37, FALSE, 4, -1, "File Name", cip_stringi, &hf_file_filename, NULL },
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
/* Time Sync Object (class attributes) */
{0x43, TRUE, 1, 0, CLASS_ATTRIBUTE_1_NAME, cip_uint, &hf_attr_class_revision, NULL },
{0x43, TRUE, 2, 1, CLASS_ATTRIBUTE_2_NAME, cip_uint, &hf_attr_class_max_instance, NULL },
{0x43, TRUE, 3, 2, CLASS_ATTRIBUTE_3_NAME, cip_uint, &hf_attr_class_num_instance, NULL },
{0x43, TRUE, 4, 3, CLASS_ATTRIBUTE_4_NAME, cip_dissector_func, NULL, dissect_optional_attr_list },
{0x43, TRUE, 5, 4, CLASS_ATTRIBUTE_5_NAME, cip_dissector_func, NULL, dissect_optional_service_list },
{0x43, TRUE, 6, 5, CLASS_ATTRIBUTE_6_NAME, cip_uint, &hf_attr_class_num_class_attr, NULL },
{0x43, TRUE, 7, 6, CLASS_ATTRIBUTE_7_NAME, cip_uint, &hf_attr_class_num_inst_attr, NULL },
/* Time Sync Object (instance attributes) */
{0x43, FALSE, 1, -1, "PTP Enable", cip_bool, &hf_time_sync_ptp_enable, NULL},
{0x43, FALSE, 2, -1, "Is Synchronized", cip_bool, &hf_time_sync_is_synchronized, NULL},
{0x43, FALSE, 3, -1, "System Time (Microseconds)", cip_ulint, &hf_time_sync_sys_time_micro, NULL},
{0x43, FALSE, 4, -1, "System Time (Nanoseconds)", cip_ulint, &hf_time_sync_sys_time_nano, NULL},
{0x43, FALSE, 5, -1, "Offset from Master", cip_lint, &hf_time_sync_offset_from_master, NULL},
{0x43, FALSE, 6, -1, "Max Offset from Master", cip_ulint, &hf_time_sync_max_offset_from_master, NULL},
{0x43, FALSE, 7, -1, "Mean Path Delay To Master", cip_lint, &hf_time_sync_mean_path_delay_to_master, NULL},
{0x43, FALSE, 8, -1, "Grand Master Clock Info", cip_dissector_func, NULL, dissect_time_sync_grandmaster_clock},
{0x43, FALSE, 9, -1, "Parent Clock Info", cip_dissector_func, NULL, dissect_time_sync_parent_clock},
{0x43, FALSE, 10, -1, "Local Clock Info", cip_dissector_func, NULL, dissect_time_sync_local_clock},
{0x43, FALSE, 11, -1, "Number of Ports", cip_uint, &hf_time_sync_num_ports, NULL},
{0x43, FALSE, 12, -1, "Port State Info", cip_dissector_func, NULL, dissect_time_sync_port_state_info},
{0x43, FALSE, 13, -1, "Port Enable Cfg", cip_dissector_func, NULL, dissect_time_sync_port_enable_cfg},
{0x43, FALSE, 14, -1, "Port Log Announcement Interval Cfg", cip_dissector_func, NULL, dissect_time_sync_port_log_announce},
{0x43, FALSE, 15, -1, "Port Log Sync Interval Cfg", cip_dissector_func, NULL, dissect_time_sync_port_log_sync},
{0x43, FALSE, 16, -1, "Priority1", cip_usint, &hf_time_sync_priority1, NULL},
{0x43, FALSE, 17, -1, "Priority2", cip_usint, &hf_time_sync_priority2, NULL},
{0x43, FALSE, 18, -1, "Domain number", cip_usint, &hf_time_sync_domain_number, NULL},
{0x43, FALSE, 19, -1, "Clock Type", cip_dissector_func, NULL, dissect_time_sync_clock_type},
{0x43, FALSE, 20, -1, "Manufacture Identity", cip_dissector_func, NULL, dissect_time_sync_manufacture_id},
{0x43, FALSE, 21, -1, "Product Description", cip_dissector_func, NULL, dissect_time_sync_prod_desc},
{0x43, FALSE, 22, -1, "Revision Data", cip_dissector_func, NULL, dissect_time_sync_revision_data},
{0x43, FALSE, 23, -1, "User Description", cip_dissector_func, NULL, dissect_time_sync_user_desc},
{0x43, FALSE, 24, -1, "Port Profile Identity Info", cip_dissector_func, NULL, dissect_time_sync_port_profile_id_info},
{0x43, FALSE, 25, -1, "Port Physical Address Info", cip_dissector_func, NULL, dissect_time_sync_port_phys_addr_info},
{0x43, FALSE, 26, -1, "Port Protocol Address Info", cip_dissector_func, NULL, dissect_time_sync_port_proto_addr_info},
{0x43, FALSE, 27, -1, "Steps Removed", cip_uint, &hf_time_sync_steps_removed, NULL},
{0x43, FALSE, 28, -1, "System Time and Offset", cip_dissector_func, NULL, dissect_time_sync_sys_time_and_offset},
Add CIP Security objects These objects are defined in Volume 8, but it doesn't make sense to create a new dissector file for them, so just distribute them where it makes the most sense in the existing CIP dissectors. Also do some conversions to proto_tree_add_bitmask while in the neighborhood. Add support for EtherNet/IP over DTLS/TLS. Change-Id: I4e658e8871eebb222816229de7594ff766264308 Reviewed-on: https://code.wireshark.org/review/13710 Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-28 21:34:14 +00:00
/* CIP Security Object (instance attributes) */
{0x5D, FALSE, 1, 0, "State", cip_usint, &hf_cip_security_state, NULL},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
CIP: Attribute updates 1. Switched to common way to parse Get Attr All, using dissect_cip_get_attribute_all_rsp, for CCO (class version) and CIP Validator. This also fixed a missing attribute in the old CIP Validator code. 2. Add cip_string2 attribute implementation 3. For CIP Validator, set the protocol as "CIPS Validator", previously this was "CIPS Supervisor". 4. For classes with subdissectors, add the service to the Info column in the response. Change-Id: Id9593ca39497261075df8146cf63ee9581462e2a Reviewed-on: https://code.wireshark.org/review/14837 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-07 01:17:34 +00:00
/* Connection Configuration Object (class attributes) */
/* Data sizes are different than common class attributes for some items. */
{ 0xF3, TRUE, 1, 0, CLASS_ATTRIBUTE_1_NAME, cip_uint, &hf_attr_class_revision, NULL },
{ 0xF3, TRUE, 2, 1, CLASS_ATTRIBUTE_2_NAME, cip_udint, &hf_cip_class_max_inst32, NULL },
{ 0xF3, TRUE, 3, 2, CLASS_ATTRIBUTE_3_NAME, cip_udint, &hf_cip_class_num_inst32, NULL },
{ 0xF3, TRUE, 4, -1, CLASS_ATTRIBUTE_4_NAME, cip_dissector_func, NULL, dissect_optional_attr_list },
{ 0xF3, TRUE, 5, -1, CLASS_ATTRIBUTE_5_NAME, cip_dissector_func, NULL, dissect_optional_service_list },
{ 0xF3, TRUE, 6, -1, CLASS_ATTRIBUTE_6_NAME, cip_uint, &hf_attr_class_num_class_attr, NULL },
{ 0xF3, TRUE, 7, -1, CLASS_ATTRIBUTE_7_NAME, cip_uint, &hf_attr_class_num_inst_attr, NULL },
{ 0xF3, TRUE, 8, 3, "Format Number", cip_uint, &hf_cip_cco_format_number, NULL },
{ 0xF3, TRUE, 9, 4, "Edit Signature", cip_udint, &hf_cip_cco_edit_signature, NULL },
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
/* Port Object (class attributes) */
{ 0xF4, TRUE, 1, 0, CLASS_ATTRIBUTE_1_NAME, cip_uint, &hf_attr_class_revision, NULL },
{ 0xF4, TRUE, 2, 1, CLASS_ATTRIBUTE_2_NAME, cip_uint, &hf_attr_class_max_instance, NULL },
{ 0xF4, TRUE, 3, 2, CLASS_ATTRIBUTE_3_NAME, cip_uint, &hf_attr_class_num_instance, NULL },
{ 0xF4, TRUE, 4, -1, CLASS_ATTRIBUTE_4_NAME, cip_dissector_func, NULL, dissect_optional_attr_list },
{ 0xF4, TRUE, 5, -1, CLASS_ATTRIBUTE_5_NAME, cip_dissector_func, NULL, dissect_optional_service_list },
{ 0xF4, TRUE, 6, -1, CLASS_ATTRIBUTE_6_NAME, cip_uint, &hf_attr_class_num_class_attr, NULL },
{ 0xF4, TRUE, 7, -1, CLASS_ATTRIBUTE_7_NAME, cip_uint, &hf_attr_class_num_inst_attr, NULL },
{ 0xF4, TRUE, 8, 3, "Entry Port", cip_uint, &hf_port_entry_port, NULL },
{ 0xF4, TRUE, 9, 4, "Port Instance Info", cip_dissector_func, NULL, dissect_port_instance_info },
/* Port Object (instance attributes) */
{ 0xF4, FALSE, 1, 0, "Port Type", cip_uint, &hf_port_type, NULL },
{ 0xF4, FALSE, 2, 1, "Port Number", cip_uint, &hf_port_number, NULL },
{ 0xF4, FALSE, 3, 2, "Link Object", cip_dissector_func, NULL, dissect_port_link_object },
{ 0xF4, FALSE, 4, 3, "Port Name", cip_short_string, &hf_port_name, NULL },
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
{ 0xF4, FALSE, 7, 4, "Port Number and Node Address", cip_dissector_func, NULL, dissect_single_segment_padded_attr },
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{ 0xF4, FALSE, 8, -1, "Port Node Range", cip_dissector_func, NULL, dissect_port_node_range },
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
{ 0xF4, FALSE, 9, -1, "Chassis Identity", cip_dissector_func, NULL, dissect_single_segment_packed_attr },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
};
typedef struct attribute_val_array {
size_t size;
attribute_info_t* attrs;
} attribute_val_array_t;
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
/* Each entry in this table (eg: cip_attribute_vals) is a list of:
Attribute information (class_id/class_instance/attribute) to attribute property
Note: If more items are added to the individual tables, it may make sense
to switch to a more efficient implementation (eg: hash table).
*/
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static attribute_val_array_t all_attribute_vals[] = {
{sizeof(cip_attribute_vals)/sizeof(attribute_info_t), cip_attribute_vals},
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{sizeof(enip_attribute_vals)/sizeof(attribute_info_t), enip_attribute_vals},
{sizeof(cip_safety_attribute_vals)/sizeof(attribute_info_t), cip_safety_attribute_vals}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
};
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
attribute_info_t* cip_get_attribute(guint class_id, guint instance, guint attribute)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
size_t i, j;
attribute_val_array_t* att_array;
attribute_info_t* pattr;
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
static attribute_info_t class_attribute_vals[] = {
{ 0, TRUE, 1, -1, CLASS_ATTRIBUTE_1_NAME, cip_uint, &hf_attr_class_revision, NULL },
{ 0, TRUE, 2, -1, CLASS_ATTRIBUTE_2_NAME, cip_uint, &hf_attr_class_max_instance, NULL },
{ 0, TRUE, 3, -1, CLASS_ATTRIBUTE_3_NAME, cip_uint, &hf_attr_class_num_instance, NULL },
{ 0, TRUE, 4, -1, CLASS_ATTRIBUTE_4_NAME, cip_dissector_func, NULL, dissect_optional_attr_list },
{ 0, TRUE, 5, -1, CLASS_ATTRIBUTE_5_NAME, cip_dissector_func, NULL, dissect_optional_service_list },
{ 0, TRUE, 6, -1, CLASS_ATTRIBUTE_6_NAME, cip_uint, &hf_attr_class_num_class_attr, NULL },
{ 0, TRUE, 7, -1, CLASS_ATTRIBUTE_7_NAME, cip_uint, &hf_attr_class_num_inst_attr, NULL },
};
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
for (i = 0; i < sizeof(all_attribute_vals)/sizeof(attribute_val_array_t); i++)
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_array = &all_attribute_vals[i];
for (j = 0; j < att_array->size; j++)
{
pattr = &att_array->attrs[j];
if ((pattr->class_id == class_id) &&
(instance != (guint)-1) &&
(((instance == 0) && (pattr->class_instance == TRUE)) || ((instance != 0) && (pattr->class_instance == FALSE))) &&
(pattr->attribute == attribute))
{
return pattr;
}
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
CIP: Add support for common class attributes Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2 Reviewed-on: https://code.wireshark.org/review/12502 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>
2015-12-10 16:39:46 +00:00
/* Check against common class attributes. */
if (instance == 0)
{
for (i = 0; i < sizeof(class_attribute_vals) / sizeof(attribute_info_t); i++)
{
pattr = &class_attribute_vals[i];
if (pattr->attribute == attribute)
{
return pattr;
}
}
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return NULL;
}
Squelch some compiler warnings. Change-Id: Ie39c7b0c1fef8f862cec016a3a1a5bd1451a3df2 Reviewed-on: https://code.wireshark.org/review/2905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06 23:48:06 +00:00
static const char *
segment_name_format(const char *segment_name, const char *fmt)
G_GNUC_FORMAT encapsulates __attribute((format_arg(...))). Change-Id: I9513c187ae4ce8b8cf8f6a926072b215e26ec64f Reviewed-on: https://code.wireshark.org/review/2907 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-07 04:29:09 +00:00
G_GNUC_FORMAT(2);
Squelch some compiler warnings. Change-Id: Ie39c7b0c1fef8f862cec016a3a1a5bd1451a3df2 Reviewed-on: https://code.wireshark.org/review/2905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06 23:48:06 +00:00
static const char *
segment_name_format(const char *segment_name, const char *fmt)
{
wmem_strbuf_t *strbuf;
strbuf = wmem_strbuf_new(wmem_packet_scope(), segment_name);
wmem_strbuf_append(strbuf, fmt);
return wmem_strbuf_get_str(strbuf);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
static int
dissect_cia(tvbuff_t *tvb, int offset, int pathpos, unsigned char segment_type,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
gboolean generate, gboolean packed, packet_info *pinfo, proto_item *epath_item,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item *item, proto_tree *tree, proto_item *path_item, proto_item ** ret_item,
const char* segment_name, const value_string* vals, int* value,
int hf8, int hf16, int hf32)
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
unsigned char logical_format;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
int segment_len;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int temp_data;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
int value_offset;
Convert a few more dissectors to wmem svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
wmem_strbuf_t *strbuf;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
gboolean extended_logical = FALSE;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
/* Extended Logical Format is slightly different than other logical formats. An extra byte is
inserted after the segment type. */
if ((segment_type & CI_LOGICAL_SEG_TYPE_MASK) == CI_LOGICAL_SEG_EXT_LOGICAL)
{
extended_logical = TRUE;
if (generate)
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
*ret_item = proto_tree_add_uint(item, hf_cip_ext_logical_type, tvb, 0, 0, tvb_get_guint8(tvb, offset + pathpos + 1));
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(*ret_item);
}
else
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
*ret_item = proto_tree_add_item(tree, hf_cip_ext_logical_type, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
}
}
logical_format = segment_type & CI_LOGICAL_SEG_FORMAT_MASK;
switch (logical_format)
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_LOGICAL_SEG_8_BIT:
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
value_offset = offset + pathpos + 1;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (extended_logical == TRUE)
{
value_offset += 1;
}
temp_data = tvb_get_guint8(tvb, value_offset);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
*ret_item = proto_tree_add_uint(item, hf8, tvb, 0, 0, temp_data );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(*ret_item);
}
else
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
*ret_item = proto_tree_add_item(tree, hf8, tvb, value_offset, 1, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
if (vals == NULL)
{
proto_item_append_text( epath_item, "%s: 0x%02X", segment_name, temp_data);
}
else
{
Squelch some compiler warnings. Change-Id: Ie39c7b0c1fef8f862cec016a3a1a5bd1451a3df2 Reviewed-on: https://code.wireshark.org/review/2905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06 23:48:06 +00:00
proto_item_append_text( epath_item, "%s", val_to_str( temp_data, vals, segment_name_format( segment_name, ": 0x%02X" ) ) );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
if (value != NULL)
*value = temp_data;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
segment_len = 2;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (extended_logical == TRUE)
{
if (packed)
{
segment_len += 1;
}
else
{
segment_len += 2;
}
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case CI_LOGICAL_SEG_16_BIT:
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (packed && extended_logical == FALSE)
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
value_offset = offset + pathpos + 1;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
segment_len = 3;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
}
else
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
value_offset = offset + pathpos + 2;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
segment_len = 4;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
temp_data = tvb_get_letohs(tvb, value_offset);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
*ret_item = proto_tree_add_uint(tree, hf16, tvb, 0, 0, temp_data );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(*ret_item);
}
else
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
*ret_item = proto_tree_add_item(tree, hf16, tvb, value_offset, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (vals == NULL)
{
proto_item_append_text( epath_item, "%s: 0x%04X", segment_name, temp_data);
}
else
{
Convert a few more dissectors to wmem svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
strbuf = wmem_strbuf_new(wmem_packet_scope(), segment_name);
wmem_strbuf_append(strbuf, ": 0x%04X");
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
Squelch some compiler warnings. Change-Id: Ie39c7b0c1fef8f862cec016a3a1a5bd1451a3df2 Reviewed-on: https://code.wireshark.org/review/2905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06 23:48:06 +00:00
proto_item_append_text( epath_item, "%s", val_to_str( temp_data, vals, segment_name_format( segment_name, ": 0x%04X" ) ) );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
if (value != NULL)
*value = temp_data;
break;
case CI_LOGICAL_SEG_32_BIT:
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (packed && extended_logical == FALSE)
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
value_offset = offset + pathpos + 1;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
segment_len = 5;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
}
else
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
value_offset = offset + pathpos + 2;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
segment_len = 6;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
}
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
temp_data = tvb_get_letohl(tvb, value_offset);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
*ret_item = proto_tree_add_uint(tree, hf32, tvb, 0, 0, temp_data );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(*ret_item);
}
else
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
*ret_item = proto_tree_add_item(tree, hf32, tvb, value_offset, 4, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
if (vals == NULL)
{
proto_item_append_text( epath_item, "%s: 0x%08X", segment_name, temp_data);
}
else
{
Convert a few more dissectors to wmem svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
strbuf = wmem_strbuf_new(wmem_packet_scope(), segment_name);
wmem_strbuf_append(strbuf, ": 0x%08X");
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
Squelch some compiler warnings. Change-Id: Ie39c7b0c1fef8f862cec016a3a1a5bd1451a3df2 Reviewed-on: https://code.wireshark.org/review/2905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06 23:48:06 +00:00
proto_item_append_text( epath_item, "%s", val_to_str( temp_data, vals, segment_name_format( segment_name, ": 0x%08X" ) ) );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
if (value != NULL)
*value = temp_data;
break;
default:
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_proto_log_seg_format);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate == FALSE)
{
proto_item_set_len(item, segment_len);
proto_item_set_len(path_item, segment_len);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return segment_len;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
/* Dissect Device ID structure */
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
static void
dissect_deviceid(tvbuff_t *tvb, int offset, proto_tree *tree,
int hf_vendor, int hf_devtype, int hf_prodcode,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int hf_compatibility, int hf_comp_bit, int hf_majrev, int hf_minrev)
{
guint compatibility;
proto_item *compatibility_item;
proto_item *compatibility_tree;
proto_tree_add_item(tree, hf_vendor, tvb, offset, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_devtype, tvb, offset+2, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(tree, hf_prodcode, tvb, offset+4, 2, ENC_LITTLE_ENDIAN);
/* Major revision/Compatibility */
compatibility = tvb_get_guint8( tvb, offset+6);
/* Add Major revision/Compatibility tree */
compatibility_item = proto_tree_add_uint_format_value(tree, hf_compatibility,
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
tvb, offset+6, 1, compatibility, "%s, Major Revision: %d",
Use val_to_str_const() where appropriate; Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
val_to_str_const( ( compatibility & 0x80 )>>7, cip_com_bit_vals , "" ),
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
compatibility & 0x7F);
compatibility_tree = proto_item_add_subtree(compatibility_item, ett_mcsc);
proto_tree_add_item(compatibility_tree, hf_comp_bit, tvb, offset+6, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(compatibility_tree, hf_majrev, tvb, offset+6, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(tree, hf_minrev, tvb, offset+7, 1, ENC_LITTLE_ENDIAN );
}
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
static void
dissect_net_param16(tvbuff_t *tvb, int offset, proto_tree *tree,
int hf_net_param16, int hf_owner, int hf_type,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int hf_priority, int hf_fixed_var, int hf_con_size, gint ncp_ett)
{
proto_item *net_param_item;
proto_tree *net_param_tree;
net_param_item = proto_tree_add_item(tree, hf_net_param16, tvb, offset, 2, ENC_LITTLE_ENDIAN );
net_param_tree = proto_item_add_subtree(net_param_item, ncp_ett);
/* Add the data to the tree */
proto_tree_add_item(net_param_tree, hf_owner, tvb, offset, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_type, tvb, offset, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_priority, tvb, offset, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_fixed_var, tvb, offset, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_con_size, tvb, offset, 2, ENC_LITTLE_ENDIAN );
}
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
static void
dissect_net_param32(tvbuff_t *tvb, int offset, proto_tree *tree,
int hf_net_param16, int hf_owner, int hf_type,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int hf_priority, int hf_fixed_var, int hf_con_size, gint ncp_ett)
{
proto_item *net_param_item;
proto_tree *net_param_tree;
net_param_item = proto_tree_add_item(tree, hf_net_param16, tvb, offset, 4, ENC_LITTLE_ENDIAN );
net_param_tree = proto_item_add_subtree(net_param_item, ncp_ett);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add the data to the tree */
proto_tree_add_item(net_param_tree, hf_owner, tvb, offset, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_type, tvb, offset, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_priority, tvb, offset, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_fixed_var, tvb, offset, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item(net_param_tree, hf_con_size, tvb, offset, 4, ENC_LITTLE_ENDIAN );
}
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
static void
dissect_transport_type_trigger(tvbuff_t *tvb, int offset, proto_tree *tree,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int hf_ttt, int hf_direction, int hf_trigger, int hf_class, gint ett)
{
proto_item *ttt_item;
proto_tree *ttt_tree;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
ttt_item = proto_tree_add_item(tree, hf_ttt, tvb, offset, 1, ENC_LITTLE_ENDIAN );
ttt_tree = proto_item_add_subtree(ttt_item, ett);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(ttt_tree, hf_direction, tvb, offset, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(ttt_tree, hf_trigger, tvb, offset, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(ttt_tree, hf_class, tvb, offset, 1, ENC_LITTLE_ENDIAN );
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
static int dissect_segment_network_extended(tvbuff_t *tvb, int offset, int pathpos, gboolean generate, proto_tree *net_tree)
{
int data_words;
data_words = tvb_get_guint8(tvb, offset + pathpos + 1);
if (generate)
{
proto_item *it;
guint16 temp_data;
it = proto_tree_add_uint_format_value(net_tree, hf_cip_seg_network_size,
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
tvb, 0, 0, data_words, "%d (words)", data_words);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
temp_data = tvb_get_letohs(tvb, offset + pathpos + 2);
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(net_tree, hf_cip_seg_network_subtype, tvb, 0, 0, temp_data);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_uint_format_value(net_tree, hf_cip_seg_network_size,
tvb, offset + pathpos + 1, 1, data_words, "%d (words)", data_words);
proto_tree_add_item(net_tree, hf_cip_seg_network_subtype, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN);
}
if (generate == FALSE)
{
/* The first word of the data is the extended segment subtype, so
don't include that in the displayed data block. */
proto_tree_add_item(net_tree, hf_cip_data, tvb, offset + pathpos + 4, data_words * 2 - 2, ENC_NA);
}
return data_words * 2 + 2;
}
CIP: fix no previous prototype for 'dissect_segment_network_production_inhibit_us' [-Wmissing-prototypes] Change-Id: Ic23b26f87f38db0a40213ce7c954c8618dc966eb Reviewed-on: https://code.wireshark.org/review/13610 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>
2016-01-29 19:09:37 +00:00
static int dissect_segment_network_production_inhibit_us(tvbuff_t *tvb, int offset, int pathpos, gboolean generate, proto_tree *net_tree)
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{
int data_words;
guint32 inhibit_time;
data_words = tvb_get_guint8(tvb, offset + pathpos + 1);
inhibit_time = tvb_get_letohl(tvb, offset + pathpos + 2);
if (generate == TRUE)
{
proto_item *it;
it = proto_tree_add_uint_format_value(net_tree, hf_cip_seg_network_size,
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
tvb, 0, 0, data_words, "%d (words)", data_words);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(net_tree, hf_cip_seg_prod_inhibit_time_us, tvb, 0, 0, inhibit_time);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_uint_format_value(net_tree, hf_cip_seg_network_size,
tvb, offset + pathpos + 1, 1, data_words, "%d (words)", data_words);
proto_tree_add_item(net_tree, hf_cip_seg_prod_inhibit_time_us,
tvb, offset + pathpos + 2, 4, ENC_LITTLE_ENDIAN);
}
return (data_words * 2) + 2;
}
static int dissect_segment_symbolic(tvbuff_t *tvb, proto_tree *path_seg_tree,
proto_item *path_seg_item, proto_item *epath_item,
int offset, int pathpos, gboolean generate)
{
int seg_size;
proto_item *it;
guint8 symbol_size;
symbol_size = tvb_get_guint8(tvb, offset + pathpos) & 0x1F;
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_size, tvb, 0, 0, symbol_size);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_symbol_size, tvb, offset + pathpos, 1, ENC_LITTLE_ENDIAN);
}
if (symbol_size != 0)
{
gchar *symbol_name;
symbol_name = tvb_format_text(tvb, offset + pathpos + 1, symbol_size);
proto_item_append_text(path_seg_item, " (Symbolic Segment)");
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_string(path_seg_tree, hf_cip_symbol_ascii, tvb, 0, 0, symbol_name);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_symbol_ascii, tvb, offset + pathpos + 1, symbol_size, ENC_ASCII | ENC_NA);
}
proto_item_append_text(epath_item, "%s", symbol_name);
seg_size = symbol_size + 1;
}
else
{
/* Extended String */
guint8 string_format;
guint8 string_size;
int data_size = 0;
proto_tree *data_tree;
proto_item_append_text(path_seg_item, " (Extended String Symbolic Segment)");
string_format = tvb_get_guint8(tvb, offset + pathpos + 1) & CI_SYMBOL_SEG_FORMAT_MASK;
string_size = tvb_get_guint8(tvb, offset + pathpos + 1) & CI_SYMBOL_SEG_SIZE_MASK;
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_extended_format, tvb, 0, 0, string_format);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_symbol_extended_format, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
}
switch (string_format)
{
case CI_SYMBOL_SEG_DOUBLE:
data_size = string_size * 2;
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_double_size, tvb, 0, 0, string_size);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_symbol_double_size, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
data_tree = proto_tree_add_subtree(path_seg_tree, tvb, offset + pathpos + 2, data_size, ett_cmd_data, NULL, "Data");
proto_tree_add_item(data_tree, hf_cip_data, tvb, offset + pathpos + 2, data_size, ENC_NA);
}
proto_item_append_text(epath_item, "[Data]");
break;
case CI_SYMBOL_SEG_TRIPLE:
data_size = string_size * 3;
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_triple_size, tvb, 0, 0, string_size);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_symbol_triple_size, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
data_tree = proto_tree_add_subtree(path_seg_tree, tvb, offset + pathpos + 2, data_size, ett_cmd_data, NULL, "Data");
proto_tree_add_item(data_tree, hf_cip_data, tvb, offset + pathpos + 2, data_size, ENC_NA);
}
proto_item_append_text(epath_item, "[Data]");
break;
case CI_SYMBOL_SEG_NUMERIC:
{
guint32 numeric_data;
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_symbol_numeric_format, tvb, 0, 0, string_size);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_symbol_numeric_format, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
}
if (string_size == CI_SYMBOL_NUMERIC_USINT)
{
data_size = 1;
numeric_data = tvb_get_guint8(tvb, offset + pathpos + 2);
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_numeric_usint, tvb, 0, 0, numeric_data);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_numeric_usint, tvb, offset + pathpos + 2, 1, ENC_LITTLE_ENDIAN);
}
}
else if (string_size == CI_SYMBOL_NUMERIC_UINT)
{
data_size = 2;
numeric_data = tvb_get_letohs(tvb, offset + pathpos + 2);
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_numeric_uint, tvb, 0, 0, numeric_data);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_numeric_uint, tvb, offset + pathpos + 2, 2, ENC_LITTLE_ENDIAN);
}
}
else if (string_size == CI_SYMBOL_NUMERIC_UDINT)
{
data_size = 4;
numeric_data = tvb_get_letohl(tvb, offset + pathpos + 2);
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_numeric_udint, tvb, 0, 0, numeric_data);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_numeric_udint, tvb, offset + pathpos + 2, 4, ENC_LITTLE_ENDIAN);
}
}
else
{
/* Unknown Extended String Format. */
return 0;
}
proto_item_append_text(epath_item, "0x%x", numeric_data);
break;
}
default:
/* Unknown Extended String Format. */
return 0;
}
seg_size = 2 + data_size;
}
/* Add padding. */
seg_size += seg_size % 2;
return seg_size;
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
static int dissect_cip_segment_single(packet_info *pinfo, tvbuff_t *tvb, int offset, int pathpos, proto_tree *path_tree, proto_item *epath_item,
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
gboolean generate, gboolean packed, cip_simple_request_info_t* req_data, cip_safety_epath_info_t* safety,
Don't let the existence of a protocol tree affect what's in the Info column. A dissector must never assume that it will, or won't, be called with a protocol tree; it's up to the Wireshark/TShark/etc. core to decide whether to do it, and it can change its behavior over time or even change it from release to release. Have dissect_epath() take an argument that explicitly indicates whether to add the CIP class to the Info column, rather than assuming that you do so only if the tree pointer passed to it is null. Bug: 12257 Change-Id: Ide8a6fc21252880f849a8d0aa4659a675bb3ae04 Reviewed-on: https://code.wireshark.org/review/14456 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 02:35:20 +00:00
int display_type, proto_item *msp_item,
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
gboolean is_msp_item)
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
int temp_data, temp_data2, seg_size, i;
int segment_len = 0;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
unsigned char segment_type, opt_link_size;
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
proto_tree *port_tree, *net_tree;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
proto_tree *cia_tree, *ds_tree, *ds_data_tree, *path_seg_tree, *safety_tree;
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
proto_item *it, *cia_item, *cia_ret_item, *port_item, *ds_item, *ds_data_item;
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
proto_item *net_item, *path_seg_item;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attribute_info_t* att_info;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (tvb_reported_length_remaining(tvb, offset + pathpos) <= 0)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_mal_incomplete_epath);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
/* Get segment type */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
segment_type = tvb_get_guint8( tvb, offset + pathpos );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
path_seg_item = proto_tree_add_uint(path_tree, hf_cip_path_segment, tvb, 0, 0, segment_type );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(path_seg_item);
path_seg_tree = proto_item_add_subtree( path_seg_item, ett_path_seg );
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_path_segment_type, tvb, 0, 0, segment_type&CI_SEGMENT_TYPE_MASK);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
path_seg_item = proto_tree_add_item(path_tree, hf_cip_path_segment, tvb, offset + pathpos, 1, ENC_LITTLE_ENDIAN);
path_seg_tree = proto_item_add_subtree( path_seg_item, ett_path_seg );
proto_tree_add_item(path_seg_tree, hf_cip_path_segment_type, tvb, offset + pathpos, 1, ENC_LITTLE_ENDIAN);
}
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Determine the segment type */
switch( segment_type & CI_SEGMENT_TYPE_MASK )
{
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
case CI_PORT_SEGMENT:
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
guint8 port_id;
gboolean extended_port = FALSE;
Add in a default value for extended_port_offset to avoid warning (-> error) with gcc-4.4.x Change-Id: I823787dd7c4c92d74cd294e6e2d44b3574ae4d20 Reviewed-on: https://code.wireshark.org/review/13909 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-11 22:00:43 +00:00
int extended_port_offset = 0;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add Extended Link Address flag & Port Identifier*/
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_boolean(path_seg_tree, hf_cip_port_ex_link_addr, tvb, 0, 0, segment_type & CI_PORT_SEG_EX_LINK_ADDRESS);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_port, tvb, 0, 0, ( segment_type & 0x0F ) );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
port_tree = proto_tree_add_subtree(path_seg_tree, tvb, 0, 0, ett_port_path, &port_item, "Port Segment");
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
PROTO_ITEM_SET_GENERATED(port_item);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
else
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(path_seg_tree, hf_cip_port_ex_link_addr, tvb, offset+pathpos, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(path_seg_tree, hf_cip_port, tvb, offset + pathpos, 1, ENC_LITTLE_ENDIAN);
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
port_tree = proto_tree_add_subtree(path_seg_tree, tvb, offset + pathpos, 1, ett_port_path, &port_item, "Port Segment");
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
port_id = segment_type & CI_PORT_SEG_PORT_ID_MASK;
if (port_id == 0xF)
{
extended_port = TRUE;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_append_text( path_seg_item, " (Port Segment)");
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
proto_item_append_text( epath_item, "Port: %d", port_id );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if( segment_type & CI_PORT_SEG_EX_LINK_ADDRESS )
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
int offset_link_address = 2;
if (extended_port == TRUE)
{
offset_link_address += 2;
extended_port_offset = offset + pathpos + 2;
}
opt_link_size = tvb_get_guint8(tvb, offset + pathpos + 1);
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
if ( generate )
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add size of extended link address */
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(port_tree, hf_cip_link_address_size, tvb, 0, 0, opt_link_size);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
/* Add extended link address */
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_string(port_tree, hf_cip_link_address_string, tvb, 0, 0, tvb_format_text(tvb, offset+pathpos+offset_link_address, opt_link_size) );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
proto_tree_add_item( port_tree, hf_cip_link_address_size, tvb, offset+pathpos+1, 1, ENC_LITTLE_ENDIAN );
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
proto_tree_add_item( port_tree, hf_cip_link_address_string, tvb, offset+pathpos+offset_link_address, opt_link_size, ENC_ASCII|ENC_NA );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
proto_item_append_text( epath_item, ", Address: %s", tvb_format_text(tvb, offset+pathpos+offset_link_address, opt_link_size) );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
/* Pad byte */
if( opt_link_size % 2 )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 1 + offset_link_address + opt_link_size;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
else
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = offset_link_address + opt_link_size;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
}
else
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
int offset_link_address = 1;
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 2;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (extended_port == TRUE)
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len += 2;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
offset_link_address += 2;
extended_port_offset = offset + pathpos + 1;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Add Link Address */
if ( generate )
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(port_tree, hf_cip_link_address_byte, tvb, 0, 0, tvb_get_guint8( tvb, offset + pathpos + offset_link_address ) );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
PROTO_ITEM_SET_GENERATED(it);
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
else
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
proto_tree_add_item(port_tree, hf_cip_link_address_byte, tvb, offset+pathpos+offset_link_address, 1, ENC_LITTLE_ENDIAN );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
proto_item_append_text( epath_item, ", Address: %d",tvb_get_guint8( tvb, offset + pathpos + offset_link_address ) );
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (extended_port == TRUE)
{
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(port_tree, hf_cip_port_extended, tvb, 0, 0, tvb_get_letohs(tvb, extended_port_offset));
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(port_tree, hf_cip_port_extended, tvb, extended_port_offset, 2, ENC_LITTLE_ENDIAN);
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
}
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate == FALSE)
{
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
proto_item_set_len(port_item, segment_len);
proto_item_set_len(path_seg_item, segment_len);
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
break;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
case CI_LOGICAL_SEGMENT:
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{
guint8 logical_seg_type;
logical_seg_type = segment_type & CI_LOGICAL_SEG_TYPE_MASK;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Logical segment, determine the logical type */
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_logical_seg_type, tvb, 0, 0, logical_seg_type);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (logical_seg_type != CI_LOGICAL_SEG_SPECIAL && logical_seg_type != CI_LOGICAL_SEG_SERV_ID)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_logical_seg_format, tvb, 0, 0, segment_type & CI_LOGICAL_SEG_FORMAT_MASK);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
cia_tree = proto_tree_add_subtree(path_seg_tree, tvb, 0, 0, ett_cia_path, &cia_item,
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
val_to_str_const( ((segment_type & (CI_LOGICAL_SEG_TYPE_MASK|CI_LOGICAL_SEG_FORMAT_MASK))), cip_logical_seg_vals, "Reserved"));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(cia_item);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_logical_seg_type, tvb, offset+pathpos, 1, ENC_LITTLE_ENDIAN );
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
if (logical_seg_type != CI_LOGICAL_SEG_SPECIAL && logical_seg_type != CI_LOGICAL_SEG_SERV_ID)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(path_seg_tree, hf_cip_logical_seg_format, tvb, offset + pathpos, 1, ENC_LITTLE_ENDIAN);
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
cia_tree = proto_tree_add_subtree(path_seg_tree, tvb, offset + pathpos, 1, ett_cia_path, &cia_item,
val_to_str_const( ((segment_type & (CI_LOGICAL_SEG_TYPE_MASK|CI_LOGICAL_SEG_FORMAT_MASK))), cip_logical_seg_vals, "Reserved"));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
Use val_to_str_const() where appropriate; Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
proto_item_append_text( path_seg_item, " (%s)", val_to_str_const( ((segment_type & (CI_LOGICAL_SEG_TYPE_MASK|CI_LOGICAL_SEG_FORMAT_MASK))), cip_logical_seg_vals, "Reserved"));
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
switch (logical_seg_type)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
case CI_LOGICAL_SEG_CLASS_ID:
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = dissect_cia(tvb, offset, pathpos, segment_type, generate, packed, pinfo,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
epath_item, cia_item, cia_tree, path_seg_item, &cia_ret_item,
"Class", cip_class_names_vals, (req_data == NULL) ? NULL : &req_data->iClass,
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
hf_cip_class8, hf_cip_class16, hf_cip_class32);
if (segment_len == 0)
{
return 0;
}
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
if (req_data != NULL)
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
{
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
if (cip_enhanced_info_column == TRUE && is_msp_item == FALSE)
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
{
add_cip_class_to_info_column(pinfo, req_data->iClass, display_type);
}
if (msp_item != NULL)
{
proto_item_append_text(msp_item, "%s - ", val_to_str(req_data->iClass, cip_class_names_vals, "Class (0x%02x)"));
}
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_LOGICAL_SEG_INST_ID:
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = dissect_cia(tvb, offset, pathpos, segment_type, generate, packed, pinfo,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
epath_item, cia_item, cia_tree, path_seg_item, &cia_ret_item,
"Instance", NULL, (req_data == NULL) ? NULL : &req_data->iInstance,
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
hf_cip_instance8, hf_cip_instance16, hf_cip_instance32);
if (segment_len == 0)
{
return 0;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_LOGICAL_SEG_MBR_ID:
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = dissect_cia(tvb, offset, pathpos, segment_type, generate, packed, pinfo,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
epath_item, cia_item, cia_tree, path_seg_item, &cia_ret_item,
"Member", NULL, (req_data == NULL) ? NULL : &req_data->iMember,
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
hf_cip_member8, hf_cip_member16, hf_cip_member32);
if (segment_len == 0)
{
return 0;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_LOGICAL_SEG_ATTR_ID:
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = dissect_cia(tvb, offset, pathpos, segment_type, generate, packed, pinfo,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
epath_item, cia_item, cia_tree, path_seg_item, &cia_ret_item,
"Attribute", NULL, (req_data == NULL) ? NULL : &req_data->iAttribute,
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
hf_cip_attribute8, hf_cip_attribute16, hf_cip_attribute32);
if (segment_len == 0)
{
return 0;
}
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (req_data != NULL)
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
att_info = cip_get_attribute(req_data->iClass, req_data->iInstance,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
req_data->iAttribute);
if (att_info != NULL)
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_append_text(cia_ret_item, " (%s)", att_info->text);
proto_item_append_text(epath_item, " (%s)", att_info->text);
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_LOGICAL_SEG_CON_POINT:
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = dissect_cia(tvb, offset, pathpos, segment_type, generate, packed, pinfo,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
epath_item, cia_item, cia_tree, path_seg_item, &cia_ret_item,
"Connection Point", NULL, NULL,
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
hf_cip_conpoint8, hf_cip_conpoint16, hf_cip_conpoint32);
if (segment_len == 0)
{
return 0;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_LOGICAL_SEG_SPECIAL:
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Logical Special ID, the only logical format specified is electronic key */
if( ( segment_type & CI_LOGICAL_SEG_FORMAT_MASK ) == CI_LOGICAL_SEG_E_KEY )
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Get the Key Format */
temp_data = tvb_get_guint8( tvb, offset + pathpos + 1 );
if( temp_data == CI_E_KEY_FORMAT_VAL )
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(cia_tree, hf_cip_ekey_format, tvb, 0, 0, temp_data);
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(cia_tree, hf_cip_ekey_format, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
/* dissect the device ID */
dissect_deviceid(tvb, offset + pathpos + 2, cia_tree,
hf_cip_ekey_vendor, hf_cip_ekey_devtype, hf_cip_ekey_prodcode,
hf_cip_ekey_compatibility, hf_cip_ekey_comp_bit, hf_cip_ekey_majorrev, hf_cip_ekey_minorrev);
proto_item_set_len(path_seg_item, 10);
proto_item_set_len(cia_item, 10);
}
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add "summary" information to parent item */
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
temp_data = tvb_get_letohs( tvb, offset + pathpos + 2 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_append_text( cia_tree, " (VendorID: 0x%04X", temp_data );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
temp_data = tvb_get_letohs( tvb, offset + pathpos + 4 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_append_text( cia_tree, ", DevTyp: 0x%04X", temp_data );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
temp_data = tvb_get_guint8( tvb, offset + pathpos + 8 );
temp_data2 = tvb_get_guint8( tvb, offset + pathpos + 9 );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_append_text(cia_tree, ", %d.%d)", ( temp_data & 0x7F ), temp_data2 );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
proto_item_append_text(epath_item, "[Key]" );
Revert changes committed by an accident. Will be committed again later. svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 10;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
else
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_proto_electronic_key_format);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
}
else
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_proto_special_segment_format);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
break;
Revert changes committed by an accident. Will be committed again later. svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
case CI_LOGICAL_SEG_SERV_ID:
/* Logical Service ID - the only logical format specified is 8-bit Service ID */
if ((segment_type & CI_LOGICAL_SEG_FORMAT_MASK) == CI_LOGICAL_SEG_8_BIT)
{
guint8 service_id;
service_id = tvb_get_guint8(tvb, offset + pathpos + 1);
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(cia_tree, hf_cip_serviceid8, tvb, 0, 0, service_id);
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(cia_tree, hf_cip_serviceid8, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
proto_item_set_len(path_seg_item, 2);
proto_item_set_len(cia_item, 2);
}
proto_item_append_text(epath_item, "Service ID: 0x%x", service_id);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 2;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
}
else
{
expert_add_info(pinfo, epath_item, &ei_proto_log_seg_type);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
}
break;
case CI_LOGICAL_SEG_EXT_LOGICAL:
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = dissect_cia(tvb, offset, pathpos, segment_type, generate, packed, pinfo,
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
epath_item, cia_item, cia_tree, path_seg_item, &cia_ret_item,
"Extended Logical", NULL, NULL,
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
hf_cip_ext_logical8, hf_cip_ext_logical16, hf_cip_ext_logical32);
if (segment_len == 0)
{
return 0;
}
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
default:
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_proto_log_seg_type);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
Revert changes committed by an accident. Will be committed again later. svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
} /* end of switch( logical_seg_type ) */
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
break;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
}
Moved setting of length2 to make it always set. svn path=/trunk/; revision=28777
2009-06-19 05:45:40 +00:00
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
case CI_DATA_SEGMENT:
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Data segment, determine the logical type */
if ( generate )
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_data_seg_type, tvb, 0, 0, segment_type & CI_DATA_SEG_TYPE_MASK);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
ds_tree = proto_tree_add_subtree(path_seg_tree, tvb, 0, 0, ett_data_seg, &ds_item,
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
val_to_str_const( (segment_type & CI_DATA_SEG_TYPE_MASK), cip_data_segment_type_vals, "Reserved"));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(ds_item);
}
else
{
proto_tree_add_item(path_seg_tree, hf_cip_data_seg_type, tvb, offset+pathpos, 1, ENC_LITTLE_ENDIAN );
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
ds_tree = proto_tree_add_subtree(path_seg_tree, tvb, offset + pathpos, 1, ett_data_seg, &ds_item,
val_to_str_const( (segment_type & CI_DATA_SEG_TYPE_MASK), cip_data_segment_type_vals, "Reserved"));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Use val_to_str_const() where appropriate; Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
proto_item_append_text( path_seg_item, " (%s)", val_to_str_const( (segment_type & CI_DATA_SEG_TYPE_MASK), cip_data_segment_type_vals, "Reserved"));
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
switch( segment_type & CI_DATA_SEG_TYPE_MASK)
{
case CI_DATA_SEG_SIMPLE:
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Segment size */
seg_size = tvb_get_guint8( tvb, offset + pathpos+1 )*2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate)
{
it = proto_tree_add_uint_format_value(ds_tree, hf_cip_data_seg_size,
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
tvb, 0, 0, seg_size, "%d (words)", seg_size / 2);
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_uint_format_value(ds_tree, hf_cip_data_seg_size,
tvb, offset + pathpos + 1, 1, seg_size, "%d (words)", seg_size / 2);
}
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Segment data */
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if( seg_size != 0 && generate == FALSE )
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
ds_data_tree = proto_tree_add_subtree( ds_tree, tvb, offset + pathpos+2, 0, ett_data_seg_data, &ds_data_item, "Data" );
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
for( i=0; i < seg_size/2; i ++ )
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(ds_data_tree, hf_cip_data_seg_item, tvb, offset + pathpos+2+(i*2), 2, ENC_LITTLE_ENDIAN );
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_set_len(ds_data_item, seg_size);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate == FALSE)
{
proto_item_set_len(ds_item, 2 + seg_size);
proto_item_set_len(path_seg_item, 2 + seg_size);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 2 + seg_size;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
proto_item_append_text(epath_item, "[Data]" );
break;
case CI_DATA_SEG_SYMBOL:
/* ANSI extended symbol segment */
/* Segment size */
seg_size = tvb_get_guint8( tvb, offset + pathpos+1 );
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(ds_tree, hf_cip_data_seg_type, tvb, 0, 0, seg_size);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(ds_tree, hf_cip_data_seg_size, tvb, offset + pathpos+1, 1, ENC_LITTLE_ENDIAN );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Segment data */
if( seg_size != 0 )
{
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
gchar *symbol_name;
symbol_name = tvb_format_text(tvb, offset + pathpos + 2, seg_size);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
if ( generate )
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_string(ds_tree, hf_cip_symbol, tvb, 0, 0, symbol_name);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
proto_tree_add_item( ds_tree, hf_cip_symbol, tvb, offset + pathpos + 2, seg_size, ENC_ASCII|ENC_NA );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
proto_item_append_text(epath_item, "%s", symbol_name);
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
if (cip_enhanced_info_column == TRUE && is_msp_item == FALSE)
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
{
add_cip_symbol_to_info_column(pinfo, symbol_name, display_type);
}
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
if (msp_item != NULL)
{
proto_item_append_text(msp_item, "'%s' - ", symbol_name);
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Check for pad byte */
if( seg_size %2 )
seg_size++;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( !generate )
{
proto_item_set_len( ds_item, 2 + seg_size );
proto_item_set_len( path_seg_item, 2 + seg_size );
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 2 + seg_size;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
default:
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_proto_log_sub_seg_type);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
} /* End of switch sub-type */
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_NETWORK_SEGMENT:
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Network segment -Determine the segment sub-type */
if ( generate )
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(path_seg_tree, hf_cip_network_seg_type, tvb, 0, 0, segment_type & CI_NETWORK_SEG_TYPE_MASK);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(it);
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
net_tree = proto_tree_add_subtree(path_seg_tree, tvb, 0, 0, ett_network_seg, &net_item,
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
val_to_str_const( (segment_type & CI_NETWORK_SEG_TYPE_MASK), cip_network_segment_type_vals, "Reserved"));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
PROTO_ITEM_SET_GENERATED(net_item);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
else
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(path_seg_tree, hf_cip_network_seg_type, tvb, offset+pathpos, 1, ENC_LITTLE_ENDIAN );
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
net_tree = proto_tree_add_subtree(path_seg_tree, tvb, offset + pathpos, 1, ett_network_seg, &net_item,
val_to_str_const( (segment_type & CI_NETWORK_SEG_TYPE_MASK), cip_network_segment_type_vals, "Reserved"));
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Use val_to_str_const() where appropriate; Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
proto_item_append_text( path_seg_item, " (%s)", val_to_str_const( (segment_type & CI_NETWORK_SEG_TYPE_MASK), cip_network_segment_type_vals, "Reserved"));
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
switch( segment_type & CI_NETWORK_SEG_TYPE_MASK )
{
case CI_NETWORK_SEG_SCHEDULE:
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(net_tree, hf_cip_seg_schedule, tvb, 0, 0, tvb_get_guint8(tvb, offset + pathpos + 1));
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(net_tree, hf_cip_seg_schedule, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
proto_item_set_len(net_item, 2);
proto_item_set_len(path_seg_item, 2);
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_NETWORK_SEG_FIXED_TAG:
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(net_tree, hf_cip_seg_fixed_tag, tvb, 0, 0, tvb_get_guint8(tvb, offset + pathpos + 1));
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
proto_tree_add_item(net_tree, hf_cip_seg_fixed_tag, tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
proto_item_set_len(net_item, 2);
proto_item_set_len(path_seg_item, 2);
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case CI_NETWORK_SEG_PROD_INHI:
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
temp_data = tvb_get_guint8( tvb, offset + pathpos + 1 );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
if (generate)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
it = proto_tree_add_uint(net_tree, hf_cip_seg_prod_inhibit_time, tvb, 0, 0, temp_data);
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
PROTO_ITEM_SET_GENERATED(it);
}
else
{
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
proto_tree_add_item(net_tree, hf_cip_seg_prod_inhibit_time,
tvb, offset + pathpos + 1, 1, ENC_LITTLE_ENDIAN);
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
proto_item_set_len(net_item, 2);
proto_item_set_len(path_seg_item, 2);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = 2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
case CI_NETWORK_SEG_PROD_INHI_US:
{
seg_size = dissect_segment_network_production_inhibit_us(tvb, offset, pathpos, generate, net_tree);
if (generate == FALSE)
{
proto_item_set_len(net_item, seg_size);
proto_item_set_len(path_seg_item, seg_size);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = seg_size;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
break;
}
case CI_NETWORK_SEG_EXTENDED:
seg_size = dissect_segment_network_extended(tvb, offset, pathpos, generate, net_tree);
proto_item_append_text(epath_item, "[Data]");
if (generate == FALSE)
{
proto_item_set_len(net_tree, seg_size);
proto_item_set_len(path_seg_item, seg_size);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = seg_size;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
break;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
case CI_NETWORK_SEG_SAFETY:
proto_item_append_text(epath_item, "[Safety]" );
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
seg_size = tvb_get_guint8(tvb, offset + pathpos + 1) * 2;
if (generate)
{
/* TODO: Skip printing information in response packets for now. Think of a better way to handle
generated data that doesn't require a lot of copy-paste. */
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = seg_size + 2;
CIP: Ensure that all generated data is properly flagged as Generated and no lengths are set for it. This ensures: 1. Generated data shows inside brackets [], so it's obvious that the data was actually generated. 2. Clicking on generated data should not highlight bytes in the packet. Previously, this would sometimes highlight parts of the response packet that were unrelated. 3. Fixes some assertions that hit in PDML exporting code, due to wrong data locations being referenced. Bug: 11863 Change-Id: Ia7ea9d886c8fff0c302088bed44b974ff9447a92 Reviewed-on: https://code.wireshark.org/review/12468 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>
2015-12-07 15:20:19 +00:00
break;
}
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
/* Segment size */
proto_tree_add_uint_format_value(net_tree, hf_cip_seg_network_size,
tvb, offset + pathpos+1, 1, seg_size/2, "%d (words)", seg_size/2);
proto_tree_add_item(net_tree, hf_cip_seg_safety_format, tvb, offset+pathpos+2, 1, ENC_LITTLE_ENDIAN );
/* Safety Network Segment Format */
temp_data = tvb_get_guint8( tvb, offset + pathpos + 2 );
if (temp_data < 3)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
safety_tree = proto_tree_add_subtree(net_tree, tvb, offset + pathpos+3, seg_size-1,
ett_network_seg_safety, NULL, val_to_str_const(temp_data, cip_safety_segment_format_type_vals, "Reserved"));
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
switch (temp_data)
{
case 0:
/* Target Format */
if (safety != NULL)
safety->format = CIP_SAFETY_BASE_FORMAT;
proto_tree_add_item(safety_tree, hf_cip_seg_safety_reserved, tvb, offset+pathpos+3, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_configuration_crc, tvb, offset+pathpos+4, 4, ENC_LITTLE_ENDIAN );
dissect_cipsafety_ssn(safety_tree, tvb, pinfo, offset+pathpos+8, hf_cip_seg_safety_configuration_timestamp, hf_cip_seg_safety_configuration_date, hf_cip_seg_safety_configuration_time);
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_epi, tvb, offset+pathpos+14, 4, ENC_LITTLE_ENDIAN );
dissect_net_param16(tvb, offset+pathpos+18, safety_tree,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
hf_cip_seg_safety_time_correction_net_params, hf_cip_seg_safety_time_correction_own,
hf_cip_seg_safety_time_correction_typ, hf_cip_seg_safety_time_correction_prio,
hf_cip_seg_safety_time_correction_fixed_var, hf_cip_seg_safety_time_correction_con_size,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
ett_network_seg_safety_time_correction_net_params);
it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_tunid, tvb, offset+pathpos+20, 10, ENC_NA);
dissect_unid(tvb, pinfo, offset+pathpos+20, it, "Target UNID SNN", hf_cip_seg_safety_tunid_ssn_timestamp,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
hf_cip_seg_safety_tunid_ssn_date, hf_cip_seg_safety_tunid_ssn_time, hf_cip_seg_safety_tunid_macid,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
ett_cip_seg_safety_tunid, ett_cip_seg_safety_tunid_ssn);
it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_ounid, tvb, offset+pathpos+30, 10, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
dissect_unid(tvb, pinfo, offset+pathpos+30, it, "Originator UNID SSN", hf_cip_seg_safety_ounid_ssn_timestamp,
hf_cip_seg_safety_ounid_ssn_date, hf_cip_seg_safety_ounid_ssn_time, hf_cip_seg_safety_ounid_macid,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
ett_cip_seg_safety_ounid, ett_cip_seg_safety_ounid_ssn);
proto_tree_add_item(safety_tree, hf_cip_seg_safety_ping_eri_multiplier, tvb, offset+pathpos+40, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_coord_msg_min_multiplier, tvb, offset+pathpos+42, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_network_time_expected_multiplier, tvb, offset+pathpos+44, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_timeout_multiplier, tvb, offset+pathpos+46, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_max_consumer_number, tvb, offset+pathpos+47, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_conn_param_crc, tvb, offset+pathpos+48, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_conn_id, tvb, offset+pathpos+52, 4, ENC_LITTLE_ENDIAN );
break;
case 1:
/* Router Format */
if (safety != NULL)
safety->format = CIP_SAFETY_BASE_FORMAT;
proto_tree_add_item(safety_tree, hf_cip_seg_safety_reserved, tvb, offset+pathpos+3, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_conn_id, tvb, offset+pathpos+4, 4, ENC_LITTLE_ENDIAN );
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_epi, tvb, offset+pathpos+8, 4, ENC_LITTLE_ENDIAN );
dissect_net_param16(tvb, offset+pathpos+12, safety_tree,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
hf_cip_seg_safety_time_correction_net_params, hf_cip_seg_safety_time_correction_own,
hf_cip_seg_safety_time_correction_typ, hf_cip_seg_safety_time_correction_prio,
hf_cip_seg_safety_time_correction_fixed_var, hf_cip_seg_safety_time_correction_con_size,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
ett_network_seg_safety_time_correction_net_params);
break;
case 2:
/* Extended Format */
if (safety != NULL)
safety->format = CIP_SAFETY_EXTENDED_FORMAT;
proto_tree_add_item(safety_tree, hf_cip_seg_safety_reserved, tvb, offset+pathpos+3, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_configuration_crc, tvb, offset+pathpos+4, 4, ENC_LITTLE_ENDIAN );
dissect_cipsafety_ssn(safety_tree, tvb, pinfo, offset+pathpos+8, hf_cip_seg_safety_configuration_timestamp, hf_cip_seg_safety_configuration_date, hf_cip_seg_safety_configuration_time);
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_epi, tvb, offset+pathpos+14, 4, ENC_LITTLE_ENDIAN );
dissect_net_param16(tvb, offset+pathpos+18, safety_tree,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
hf_cip_seg_safety_time_correction_net_params, hf_cip_seg_safety_time_correction_own,
hf_cip_seg_safety_time_correction_typ, hf_cip_seg_safety_time_correction_prio,
hf_cip_seg_safety_time_correction_fixed_var, hf_cip_seg_safety_time_correction_con_size,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
ett_network_seg_safety_time_correction_net_params);
it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_tunid, tvb, offset+pathpos+20, 10, ENC_NA);
dissect_unid(tvb, pinfo, offset+pathpos+20, it, "Target UNID SNN", hf_cip_seg_safety_tunid_ssn_timestamp,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
hf_cip_seg_safety_tunid_ssn_date, hf_cip_seg_safety_tunid_ssn_time, hf_cip_seg_safety_tunid_macid,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
ett_cip_seg_safety_tunid, ett_cip_seg_safety_tunid_ssn);
it = proto_tree_add_item(safety_tree, hf_cip_seg_safety_ounid, tvb, offset+pathpos+30, 10, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
dissect_unid(tvb, pinfo, offset+pathpos+30, it, "Originator UNID SSN", hf_cip_seg_safety_ounid_ssn_timestamp,
hf_cip_seg_safety_ounid_ssn_date, hf_cip_seg_safety_ounid_ssn_time, hf_cip_seg_safety_ounid_macid,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
ett_cip_seg_safety_ounid, ett_cip_seg_safety_ounid_ssn);
proto_tree_add_item(safety_tree, hf_cip_seg_safety_ping_eri_multiplier, tvb, offset+pathpos+40, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_coord_msg_min_multiplier, tvb, offset+pathpos+42, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_network_time_expected_multiplier, tvb, offset+pathpos+44, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_timeout_multiplier, tvb, offset+pathpos+46, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_max_consumer_number, tvb, offset+pathpos+47, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_max_fault_number, tvb, offset+pathpos+48, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_conn_param_crc, tvb, offset+pathpos+50, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_time_correction_conn_id, tvb, offset+pathpos+54, 4, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_init_timestamp, tvb, offset+pathpos+58, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(safety_tree, hf_cip_seg_safety_init_rollover, tvb, offset+pathpos+60, 2, ENC_LITTLE_ENDIAN );
break;
}
}
else
{
Fix some more hf encodings. svn path=/trunk/; revision=42434
2012-05-05 00:19:49 +00:00
proto_tree_add_item(net_tree, hf_cip_seg_safety_data, tvb, offset+pathpos+3, seg_size-1, ENC_NA );
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
}
if (safety != NULL)
safety->safety_seg = TRUE;
proto_item_set_len( net_item, seg_size+2);
proto_item_set_len( path_seg_item, seg_size+2);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = seg_size + 2;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
default:
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_proto_log_sub_seg_type);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
} /* End of switch sub-type */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
case CI_SYMBOLIC_SEGMENT:
{
seg_size = dissect_segment_symbolic(tvb, path_seg_tree,
path_seg_item, epath_item,
offset, pathpos, generate);
if (seg_size == 0)
{
expert_add_info(pinfo, epath_item, &ei_proto_ext_string_format);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
}
if (generate == FALSE)
{
proto_item_set_len(path_seg_item, seg_size);
}
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
segment_len = seg_size;
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
break;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
default:
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, epath_item, &ei_proto_seg_type);
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
return 0;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
} /* end of switch( segment_type & CI_SEGMENT_TYPE_MASK ) */
CIP: Properly handle EPATH attributes that do not specify path size Most attributes specify the path length before the EPATH data, but some do not. The previous code for parsing EPATHs just looped until there was no more data. This is a problem for EPATH that do not specify a length, because it will eat up too many bytes. This mainly affects Get Attribute List Responses and Set Attribute List Requests. For the small number of attributes like this, the Spec says exactly what kind of segment should be in the EPATH, so just parse a single segment. This fixes: Port attributes: 'Port Number and Node Address' and 'Chassis Identity' There is still one that is a problem in packet-cipsafety.c, but we will have to deal with it later. See the TODO in that file. I use the .pcap attached to https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12049, to make sure I didn't break any existing path/segment handling. Ping-Bug: 12049 Change-Id: Id035f9809f6cc747ea7b6327d94dd26dc66cb466 Reviewed-on: https://code.wireshark.org/review/18675 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-04 19:50:25 +00:00
}
return segment_len;
}
void dissect_epath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *path_tree, proto_item *epath_item, int offset, int path_length,
gboolean generate, gboolean packed, cip_simple_request_info_t* req_data, cip_safety_epath_info_t* safety,
int display_type, proto_item *msp_item,
gboolean is_msp_item)
{
int pathpos = 0;
proto_item *hidden_item;
/* can't populate req_data unless it's there */
if (req_data != NULL)
{
req_data->iClass = (guint32)-1;
req_data->iInstance = (guint32)-1;
req_data->iAttribute = (guint32)-1;
req_data->iMember = (guint32)-1;
}
if (safety != NULL)
safety->safety_seg = FALSE;
if ( !generate )
{
hidden_item = proto_tree_add_item(path_tree, hf_cip_epath,
tvb, offset, path_length, ENC_NA );
PROTO_ITEM_SET_HIDDEN(hidden_item);
}
while( pathpos < path_length )
{
int segment_len;
segment_len = dissect_cip_segment_single(pinfo, tvb, offset, pathpos, path_tree, epath_item, generate, packed, req_data, safety, display_type, msp_item, is_msp_item);
if (segment_len == 0)
{
break;
}
pathpos += segment_len;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Next path segment */
if( pathpos < path_length )
proto_item_append_text( epath_item, ", " );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
} /* end of while( pathpos < path_length ) */
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
} /* end of dissect_epath() */
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
/* Number of seconds between Jan 1, 1970 00:00:00 epoch and CIP's epoch time of Jan 1, 1972 00:00:00 */
#define CIP_TIMEBASE 63003600
void dissect_cip_date_and_time(proto_tree *tree, tvbuff_t *tvb, int offset, int hf_datetime)
{
nstime_t computed_time;
guint16 num_days_since_1972;
guint32 num_ms_today;
num_days_since_1972 = tvb_get_letohs( tvb, offset);
num_ms_today = tvb_get_letohl( tvb, offset+2 );
if ((num_days_since_1972 != 0) || (num_ms_today != 0))
{
computed_time.secs = CIP_TIMEBASE+(num_days_since_1972*60*60*24);
computed_time.secs += num_ms_today/1000;
computed_time.nsecs = (num_ms_today%1000)*1000000;
}
else
{
computed_time.secs = 0;
computed_time.nsecs = 0;
}
proto_tree_add_time(tree, hf_datetime, tvb, offset, 6, &computed_time);
}
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
int dissect_cip_string_type(packet_info *pinfo, proto_tree *tree, proto_item *item,
tvbuff_t *tvb, int offset, int hf_type, int string_type)
{
guint32 string_size_field_len;
guint32 string_size;
guint string_encoding;
int parsed_len;
int total_len;
total_len = tvb_reported_length_remaining(tvb, offset);
switch (string_type)
{
case CIP_SHORT_STRING_TYPE:
string_size = tvb_get_guint8(tvb, offset);
string_encoding = ENC_ASCII | ENC_NA;
string_size_field_len = 1;
break;
case CIP_STRING_TYPE:
string_size = tvb_get_letohs(tvb, offset);
string_encoding = ENC_ASCII | ENC_NA;
string_size_field_len = 2;
break;
case CIP_STRING2_TYPE:
string_size = tvb_get_letohs(tvb, offset) * 2;
string_encoding = ENC_UCS_2 | ENC_LITTLE_ENDIAN;
string_size_field_len = 2;
break;
default:
// Unsupported.
return total_len;
break;
}
if (total_len < (int)(string_size + string_size_field_len))
{
expert_add_info(pinfo, item, &ei_mal_missing_string_data);
parsed_len = total_len;
}
else
{
proto_tree_add_item(tree, hf_type, tvb, offset + string_size_field_len, string_size, string_encoding);
parsed_len = string_size + string_size_field_len;
}
return parsed_len;
}
static int dissect_cip_stringi(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int offset)
{
int parsed_len = 1;
guint32 num_char = 0;
proto_tree_add_item_ret_uint(tree, hf_stringi_number_char, tvb, offset, 1, ENC_LITTLE_ENDIAN, &num_char);
for (guint32 i = 0; i < num_char; ++i)
{
proto_tree_add_item(tree, hf_stringi_language_char, tvb, offset + 1, 3, ENC_ASCII | ENC_NA);
guint32 char_string_type = 0;
proto_tree_add_item_ret_uint(tree, hf_stringi_char_string_struct, tvb, offset + 4, 1, ENC_LITTLE_ENDIAN, &char_string_type);
proto_tree_add_item(tree, hf_stringi_char_set, tvb, offset + 5, 2, ENC_LITTLE_ENDIAN);
parsed_len += 6;
if (char_string_type != CIP_STRING_TYPE
&& char_string_type != CIP_SHORT_STRING_TYPE
&& char_string_type != CIP_STRING2_TYPE)
{
// Unsupported type.
break;
}
parsed_len += dissect_cip_string_type(pinfo, tree, item, tvb, offset + parsed_len, hf_stringi_international_string, char_string_type);
}
return parsed_len;
}
CIP: no previous prototype for ‘dissect_cip_attribute’ [-Wmissing-prototypes] Change-Id: I61f388b136e66db9c4b909c4509db0441b1f1865 Reviewed-on: https://code.wireshark.org/review/18221 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-16 20:14:36 +00:00
static int dissect_cip_attribute(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attribute_info_t* attr, int offset, int total_len)
{
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
int i, temp_data, temp_time, hour, min, sec, ms,
consumed = 0;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
time_t computed_time;
struct tm* date;
char date_str[20];
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* sanity check */
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
if (((attr->datatype == cip_dissector_func) && (attr->pdissect == NULL)) ||
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
((attr->datatype != cip_dissector_func) && (attr->phf == NULL)))
{
DISSECTOR_ASSERT(0);
return total_len;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
switch (attr->datatype)
{
case cip_bool:
case cip_usint:
case cip_sint:
case cip_byte:
proto_tree_add_item(tree, *(attr->phf), tvb, offset, 1, ENC_LITTLE_ENDIAN);
consumed = 1;
break;
case cip_uint:
case cip_int:
case cip_word:
case cip_itime:
proto_tree_add_item(tree, *(attr->phf), tvb, offset, 2, ENC_LITTLE_ENDIAN);
consumed = 2;
break;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
case cip_byte_array:
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(tree, *(attr->phf), tvb, offset, total_len, ENC_NA);
consumed = total_len;
break;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
case cip_usint_array:
for (i = 0; i < total_len; i++)
proto_tree_add_item(tree, *(attr->phf), tvb, offset, total_len, ENC_NA);
consumed = total_len;
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case cip_uint_array:
for (i = 0; i < total_len; i+=2)
proto_tree_add_item(tree, *(attr->phf), tvb, offset+i, 2, ENC_LITTLE_ENDIAN);
consumed = i;
break;
case cip_udint:
case cip_dint:
case cip_dword:
case cip_real:
case cip_time:
case cip_ftime:
proto_tree_add_item(tree, *(attr->phf), tvb, offset, 4, ENC_LITTLE_ENDIAN);
consumed = 4;
break;
case cip_ulint:
case cip_lint:
case cip_lword:
case cip_lreal:
case cip_ltime:
proto_tree_add_item(tree, *(attr->phf), tvb, offset, 8, ENC_LITTLE_ENDIAN);
consumed = 8;
break;
case cip_short_string:
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
consumed = dissect_cip_string_type(pinfo, tree, item, tvb, offset, *(attr->phf), CIP_SHORT_STRING_TYPE);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case cip_string:
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
consumed = dissect_cip_string_type(pinfo, tree, item, tvb, offset, *(attr->phf), CIP_STRING_TYPE);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case cip_dissector_func:
consumed = attr->pdissect(pinfo, tree, item, tvb, offset, total_len);
break;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
case cip_date_and_time:
dissect_cip_date_and_time(tree, tvb, offset, *(attr->phf));
consumed = 6;
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case cip_date:
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
temp_data = tvb_get_letohs( tvb, offset);
/* Convert to nstime epoch */
computed_time = CIP_TIMEBASE+(temp_data*60*60*24);
date = gmtime(&computed_time);
gmtime() can return NULL, even if it's unlikely. ANSI C says it can return NULL - and, at least on Windows with the MSVC library, it *will* return null for dates prior to the Epoch. Check for a null return and handle it. Fixes CID 1374110. Change-Id: I78bf92cfbb94a86544442269cc3b53338eb19778 Reviewed-on: https://code.wireshark.org/review/18361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-21 22:48:34 +00:00
if (date != NULL)
strftime(date_str, 20, "%b %d, %Y", date);
else
g_strlcpy(date_str, "Not representable", sizeof date_str);
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
proto_tree_add_uint_format_value(tree, *(attr->phf), tvb, offset, 2, temp_data, "%s", date_str);
consumed = 2;
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case cip_time_of_day:
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
temp_time = temp_data = tvb_get_letohl( tvb, offset);
hour = temp_time/(60*60*1000);
temp_time %= (60*60*1000);
min = temp_time/(60*1000);
temp_time %= (60*1000);
sec = temp_time/1000;
ms = temp_time%1000;
proto_tree_add_uint_format_value(tree, *(attr->phf), tvb, offset, 4, temp_data, "%02d:%02d:%02d.%03d", hour, min, sec, ms);
consumed = 4;
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case cip_string2:
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
consumed = dissect_cip_string_type(pinfo, tree, item, tvb, offset, *(attr->phf), CIP_STRING2_TYPE);
CIP: Attribute updates 1. Switched to common way to parse Get Attr All, using dissect_cip_get_attribute_all_rsp, for CCO (class version) and CIP Validator. This also fixed a missing attribute in the old CIP Validator code. 2. Add cip_string2 attribute implementation 3. For CIP Validator, set the protocol as "CIPS Validator", previously this was "CIPS Supervisor". 4. For classes with subdissectors, add the service to the Info column in the response. Change-Id: Id9593ca39497261075df8146cf63ee9581462e2a Reviewed-on: https://code.wireshark.org/review/14837 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-07 01:17:34 +00:00
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
case cip_stringi:
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
consumed = dissect_cip_stringi(pinfo, tree, item, tvb, offset);
break;
case cip_stringN:
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* CURRENTLY NOT SUPPORTED */
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_proto_unsupported_datatype);
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
consumed = total_len;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return consumed;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/************************************************
*
* Dissector for generic CIP object
*
************************************************/
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static void
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
dissect_cip_generic_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_length, packet_info *pinfo, proto_item *ti )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
proto_tree *cmd_data_tree;
int req_path_size;
unsigned char add_stat_size;
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
int cmd_data_len;
int cmd_data_offset;
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
guint8 service = tvb_get_guint8( tvb, offset );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if (service & CIP_SC_RESPONSE_MASK)
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Response message */
add_stat_size = tvb_get_guint8( tvb, offset+3 ) * 2;
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
cmd_data_len = item_length - 4 - add_stat_size;
cmd_data_offset = offset + 4 + add_stat_size;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
else
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Request message */
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
cmd_data_len = item_length - req_path_size - 2;
cmd_data_offset = offset + 2 + req_path_size;
}
Revert changes committed by an accident. Will be committed again later. svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
/* If there is any command specific data create a sub-tree for it */
if (cmd_data_len > 0)
{
cmd_data_tree = proto_tree_add_subtree(item_tree, tvb, cmd_data_offset, cmd_data_len,
ett_cmd_data, NULL, "Command Specific Data");
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, cmd_data_offset, cmd_data_len, ENC_NA);
}
else
{
PROTO_ITEM_SET_HIDDEN(ti);
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
add_cip_service_to_info_column(pinfo, service, cip_sc_vals);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
} /* End of dissect_cip_generic_data() */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_cip_class_generic(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
proto_item *ti;
proto_tree *class_tree;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Fix: code under 'if(tree)' (in)directly calls sub-dissector/col_...()/expert...() fcns svn path=/trunk/; revision=43226
2012-06-12 21:22:46 +00:00
/* Create display subtree for the protocol */
ti = proto_tree_add_item(tree, proto_cip_class_generic, tvb, 0, -1, ENC_NA);
class_tree = proto_item_add_subtree( ti, ett_cip_class_generic );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
dissect_cip_generic_data( class_tree, tvb, 0, tvb_reported_length(tvb), pinfo, ti );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static void
dissect_cip_set_attribute_single_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item,
int offset, cip_simple_request_info_t* req_data)
{
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
int parsed_len = 0;
int total_len;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attribute_info_t* attr;
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
total_len = tvb_reported_length_remaining(tvb, offset);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attr = cip_get_attribute(req_data->iClass, req_data->iInstance, req_data->iAttribute);
if (attr != NULL)
{
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
parsed_len = dissect_cip_attribute(pinfo, tree, item, tvb, attr, offset, tvb_reported_length_remaining(tvb, offset));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
if (total_len - parsed_len > 0)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
/* Can't find the attribute or there is leftover data, treat the rest of the response as raw data */
proto_tree_add_item(tree, hf_cip_sc_set_attr_single_data, tvb, offset + parsed_len, total_len - parsed_len, ENC_NA);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
static void
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
dissect_cip_get_attribute_list_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item,
int offset, cip_simple_request_info_t* req_data)
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int i, att_count, att_value;
attribute_info_t* pattribute;
proto_item *att_list, *att_item;
proto_tree* att_tree;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Get attribute list request */
if (tvb_reported_length_remaining(tvb, offset) < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_serv_gal);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add number of attributes */
att_count = tvb_get_letohs( tvb, offset);
proto_tree_add_item(tree, hf_cip_sc_get_attr_list_attr_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add Attribute List */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
att_tree = proto_tree_add_subtree(tree, tvb, offset+2, att_count*2, ett_cip_get_attribute_list, &att_list, "Attribute List" );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
for( i=0; i < att_count; i++ )
{
att_value = tvb_get_letohs( tvb, offset+2);
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
att_item = proto_tree_add_item(att_tree, hf_cip_attribute16, tvb, offset + 2, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
pattribute = cip_get_attribute(req_data->iClass, req_data->iInstance, att_value);
if (pattribute != NULL)
proto_item_append_text(att_item, " (%s)", pattribute->text);
offset += 2;
if ((tvb_reported_length_remaining(tvb, offset+2) < 2) && (i < att_count-1))
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, att_list, &ei_mal_serv_gal_count);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
}
}
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static void
dissect_cip_set_attribute_list_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item,
int offset, cip_simple_request_info_t* req_data)
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
int i, start_offset, att_count,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_value, att_size;
attribute_info_t* attr;
proto_item *att_list, *att_item;
proto_tree *att_tree, *att_list_tree;
/* Get attribute list request */
if (tvb_reported_length_remaining(tvb, offset) < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_serv_sal);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add number of attributes */
att_count = tvb_get_letohs( tvb, offset);
proto_tree_add_item(tree, hf_cip_sc_set_attr_list_attr_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add Attribute List */
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
att_list_tree = proto_tree_add_subtree(tree, tvb, offset+2, att_count*2, ett_cip_set_attribute_list, &att_list, "Attribute List" );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
offset += 2;
start_offset = offset;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
for( i=0; i < att_count; i++ )
{
att_value = tvb_get_letohs( tvb, offset);
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
att_item = proto_tree_add_item(att_list_tree, hf_cip_attribute16, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_tree = proto_item_add_subtree( att_item, ett_cip_set_attribute_list_item);
offset += 2;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attr = cip_get_attribute(req_data->iClass, req_data->iInstance, att_value);
if (attr != NULL)
{
proto_item_append_text(att_item, " (%s)", attr->text);
/* provide attribute data */
att_size = dissect_cip_attribute(pinfo, att_tree, att_item, tvb, attr, offset, tvb_reported_length_remaining(tvb, offset));
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
offset += att_size;
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
proto_item_set_len(att_item, att_size+2);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
else
{
/* Can't find the attribute, treat the rest of the request as raw data */
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
proto_tree_add_item(att_list_tree, hf_cip_sc_set_attr_list_attr_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
break;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
if ((tvb_reported_length_remaining(tvb, offset) < 2) && (i < att_count-1))
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, att_list, &ei_mal_serv_sal_count);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
}
}
proto_item_set_len(att_list, offset-start_offset );
}
static void
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
dissect_cip_multiple_service_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item, int offset, gboolean request)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
proto_tree *mult_serv_tree, *offset_tree;
From Michael Mann: Bugfixes for both Buildbot issues: 1. seg-fault with multiple_service_packet 2. infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519 svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
int i, num_services, serv_offset, prev_offset = 0;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
cip_req_info_t *cip_req_info, *mr_single_req_info;
mr_mult_req_info_t *mr_mult_req_info = NULL;
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
if (tvb_reported_length_remaining(tvb, offset) < 2)
{
expert_add_info(pinfo, item, &ei_mal_msp_missing_services);
return;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
num_services = tvb_get_letohs( tvb, offset);
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
proto_tree_add_item(tree, hf_cip_sc_mult_serv_pack_num_services, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
Add a sanity check so we don't unnecessarily allocate memory for a Multiple Service Packet message. Bugfix 7570 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7570) svn path=/trunk/; revision=44312
2012-08-07 20:09:59 +00:00
/* Ensure a rough sanity check */
if (num_services*2 > tvb_reported_length_remaining(tvb, offset+2))
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
expert_add_info(pinfo, item, &ei_mal_msp_services);
Add a sanity check so we don't unnecessarily allocate memory for a Multiple Service Packet message. Bugfix 7570 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7570) svn path=/trunk/; revision=44312
2012-08-07 20:09:59 +00:00
}
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
offset_tree = proto_tree_add_subtree(tree, tvb, offset + 2, num_services * 2, ett_cip_msp_offset, NULL, "Offset List");
for (i = 0; i < num_services; i++)
Add a sanity check so we don't unnecessarily allocate memory for a Multiple Service Packet message. Bugfix 7570 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7570) svn path=/trunk/; revision=44312
2012-08-07 20:09:59 +00:00
{
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
proto_tree_add_item(offset_tree, hf_cip_sc_mult_serv_pack_offset, tvb, offset + 2 + i * 2, 2, ENC_LITTLE_ENDIAN);
}
cip_req_info = (cip_req_info_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0 );
if ( cip_req_info )
{
/* Only allocate memory for requests. */
if (cip_req_info->pData == NULL && request == TRUE)
{
mr_mult_req_info = wmem_new(wmem_file_scope(), mr_mult_req_info_t);
mr_mult_req_info->service = SC_MULT_SERV_PACK;
mr_mult_req_info->num_services = num_services;
mr_mult_req_info->requests = (cip_req_info_t *)wmem_alloc0(wmem_file_scope(), sizeof(cip_req_info_t)*num_services);
cip_req_info->pData = mr_mult_req_info;
}
mr_mult_req_info = (mr_mult_req_info_t*)cip_req_info->pData;
if (mr_mult_req_info
&& (mr_mult_req_info->service != SC_MULT_SERV_PACK
|| mr_mult_req_info->num_services != num_services))
{
mr_mult_req_info = NULL;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
col_append_str(pinfo->cinfo, COL_INFO, ": ");
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
for( i=0; i < num_services; i++ )
{
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
proto_item *mult_serv_item;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int serv_length;
tvbuff_t *next_tvb;
serv_offset = tvb_get_letohs( tvb, offset+2+(i*2) );
if (tvb_reported_length_remaining(tvb, serv_offset) <= 0)
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_msp_inv_offset);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
continue;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if( i == (num_services-1) )
{
/* Last service to add */
serv_length = tvb_reported_length_remaining(tvb, offset)-serv_offset;
}
else
{
serv_length = tvb_get_letohs( tvb, offset+2+((i+1)*2) ) - serv_offset;
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
mult_serv_tree = proto_tree_add_subtree_format(tree, tvb, offset+serv_offset, serv_length,
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
ett_cip_mult_service_packet, &mult_serv_item, "Service Packet #%d: ", i+1 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(mult_serv_tree, hf_cip_sc_mult_serv_pack_offset, tvb, offset+2+(i*2) , 2, ENC_LITTLE_ENDIAN);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Bugfixes for both Buildbot issues: 1. seg-fault with multiple_service_packet 2. infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519 svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
/* Make sure the offset is valid */
if ((tvb_reported_length_remaining(tvb, serv_offset) <= 0) ||
(tvb_reported_length_remaining(tvb, serv_offset+serv_length) <= 0) ||
(serv_length <= 0) ||
(prev_offset >= serv_offset))
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, mult_serv_item, &ei_mal_msp_inv_offset);
From Michael Mann: Bugfixes for both Buildbot issues: 1. seg-fault with multiple_service_packet 2. infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519 svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
prev_offset = serv_offset;
continue;
}
prev_offset = serv_offset;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/*
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
** We call ourselves again to dissect embedded packet
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
*/
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. 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-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset+serv_offset, serv_length);
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( mr_mult_req_info )
{
mr_single_req_info = mr_mult_req_info->requests + i;
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_cip_data(mult_serv_tree, next_tvb, 0, pinfo, mr_single_req_info, mult_serv_item, TRUE);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
else
{
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_cip_data(mult_serv_tree, next_tvb, 0, pinfo, NULL, mult_serv_item, TRUE);
CIP: Improve info column information 1. Remove "Object" from CIP class names. It was already removed from some of the objects, the string "Object" is implied for all objects, and it helps reduce wordiness in the Info column. 2. Don't display Class/Symbol name in the Info column when it's inside a MSP. 3. Enable enhanced Info column by default now that some of the additional wordiness was removed by the above points. 4. Put single quotes around the symbol name in the Info column. This makes it more obvious that something is a symbol instead of an actual class name from the spec, and would prevent ambiguity if the symbol name was something like "Identity". 5. Print the CIP service for both requests/responses in CIP Safety processing. This was already added to normal CIP. 6. Display Class/Symbol and service on the Service Packet in the MSP tree. This makes it easier to find without expanding every MSP item. Change-Id: I7197dd4bf3dad6d7bdba247d3d7ab76cca52c785 Reviewed-on: https://code.wireshark.org/review/14325 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03 14:21:46 +00:00
}
/* Add the embedded CIP service to the item. */
if (mult_serv_item != NULL)
{
guint8 service = tvb_get_guint8(next_tvb, 0);
proto_item_append_text(mult_serv_item, "%s", val_to_str(service & CIP_SC_MASK, cip_sc_vals, "Service (0x%02x)"));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
if (i != num_services - 1)
{
col_append_str(pinfo->cinfo, COL_INFO, ", ");
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static int
dissect_cip_generic_service_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, cip_simple_request_info_t* req_data)
{
proto_item *cmd_data_item;
int req_path_size,
offset = 0;
proto_tree *cmd_data_tree;
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
guint8 service = tvb_get_guint8( tvb, offset ) & CIP_SC_MASK;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
add_cip_service_to_info_column(pinfo, service, cip_sc_vals);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Create service tree */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree(tree, tvb, 0, -1, ett_cmd_data, &cmd_data_item,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
val_to_str(service, cip_sc_vals , "Unknown Service (0x%02x)"));
proto_item_append_text(cmd_data_item, " (Request)");
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
req_path_size = tvb_get_guint8( tvb, offset+1);
offset += ((req_path_size*2)+2);
if (tvb_reported_length_remaining(tvb, offset) <= 0)
return tvb_reported_length(tvb);
switch(service)
{
case SC_GET_ATT_ALL:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_get_attribute_all_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_SET_ATT_ALL:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_set_attribute_all_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_GET_ATT_LIST:
dissect_cip_get_attribute_list_req(tvb, pinfo, cmd_data_tree, cmd_data_item, offset, req_data);
break;
case SC_SET_ATT_LIST:
dissect_cip_set_attribute_list_req(tvb, pinfo, cmd_data_tree, cmd_data_item, offset, req_data);
break;
case SC_RESET:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_reset_param, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_sc_reset_data, tvb, offset+1, tvb_reported_length_remaining(tvb, offset+1), ENC_NA);
break;
case SC_START:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_start_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_STOP:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_stop_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_CREATE:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_create_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_DELETE:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_delete_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_MULT_SERV_PACK:
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
dissect_cip_multiple_service_packet(tvb, pinfo, cmd_data_tree, cmd_data_item, offset, TRUE);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case SC_APPLY_ATTRIBUTES:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_apply_attributes_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_GET_ATT_SINGLE:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_get_attr_single_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_SET_ATT_SINGLE:
dissect_cip_set_attribute_single_req(tvb, pinfo, cmd_data_tree, cmd_data_item, offset, req_data);
break;
case SC_FIND_NEXT_OBJ_INST:
proto_tree_add_item(cmd_data_tree, hf_cip_find_next_object_max_instance, tvb, offset, 1, ENC_LITTLE_ENDIAN);
break;
case SC_RESTOR:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_restore_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_SAVE:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_save_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_NO_OP:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_noop_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_GET_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_get_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_SET_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_set_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_INSERT_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_insert_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_REMOVE_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_remove_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_GROUP_SYNC:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_group_sync_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
typedef struct cip_gaa_key {
guint32 cip_class;
gboolean class_instance;
} cip_gaa_key_t;
typedef struct cip_gaa_val {
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
wmem_list_t *attributes;
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
} cip_gaa_val_t;
static wmem_map_t *cip_gaa_hashtable = NULL;
static guint
cip_gaa_hash (gconstpointer v)
{
const cip_gaa_key_t *key = (const cip_gaa_key_t *)v;
guint val;
val = (guint)((key->cip_class << 1) & 0xFFFFFFFE);
val |= (key->class_instance & 1);
return val;
}
static gint
cip_gaa_equal(gconstpointer v, gconstpointer w)
{
const cip_gaa_key_t *v1 = (const cip_gaa_key_t *)v;
const cip_gaa_key_t *v2 = (const cip_gaa_key_t *)w;
if ((v1->cip_class == v2->cip_class) &&
(v1->class_instance == v2->class_instance))
return 1;
return 0;
}
static void build_get_attr_all_table(void)
{
size_t i, j;
attribute_val_array_t* att_array;
attribute_info_t* pattr;
cip_gaa_key_t key;
cip_gaa_key_t* new_key;
cip_gaa_val_t *gaa_val;
int last_attribute_index = -1;
cip_gaa_hashtable = wmem_map_new(wmem_epan_scope(), cip_gaa_hash, cip_gaa_equal);
for (i = 0; i < sizeof(all_attribute_vals)/sizeof(attribute_val_array_t); i++)
{
att_array = &all_attribute_vals[i];
for (j = 0; j < att_array->size; j++)
{
pattr = &att_array->attrs[j];
key.cip_class = pattr->class_id;
key.class_instance = pattr->class_instance;
gaa_val = (cip_gaa_val_t *)wmem_map_lookup( cip_gaa_hashtable, &key );
if (gaa_val == NULL)
{
new_key = (cip_gaa_key_t*)wmem_memdup(wmem_epan_scope(), &key, sizeof(cip_gaa_key_t));
gaa_val = wmem_new0(wmem_epan_scope(), cip_gaa_val_t);
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
gaa_val->attributes = wmem_list_new(wmem_epan_scope());
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
wmem_map_insert(cip_gaa_hashtable, new_key, gaa_val );
last_attribute_index = -1;
}
if ((pattr->gaa_index >= 0) && (pattr->gaa_index > last_attribute_index))
{
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
wmem_list_append(gaa_val->attributes, pattr);
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
last_attribute_index = pattr->gaa_index;
}
}
}
}
CIP: Attribute updates 1. Switched to common way to parse Get Attr All, using dissect_cip_get_attribute_all_rsp, for CCO (class version) and CIP Validator. This also fixed a missing attribute in the old CIP Validator code. 2. Add cip_string2 attribute implementation 3. For CIP Validator, set the protocol as "CIPS Validator", previously this was "CIPS Supervisor". 4. For classes with subdissectors, add the service to the Info column in the response. Change-Id: Id9593ca39497261075df8146cf63ee9581462e2a Reviewed-on: https://code.wireshark.org/review/14837 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-07 01:17:34 +00:00
void dissect_cip_get_attribute_all_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
int offset, cip_simple_request_info_t* req_data)
{
int att_size;
gint len_remain;
attribute_info_t* attr;
proto_item *att_item;
proto_tree *att_tree;
cip_gaa_key_t key;
cip_gaa_val_t *gaa_val;
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
wmem_list_frame_t* attribute_list;
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
key.cip_class = req_data->iClass;
key.class_instance = (req_data->iInstance == 0);
gaa_val = (cip_gaa_val_t *)wmem_map_lookup( cip_gaa_hashtable, &key );
if (gaa_val == NULL)
{
proto_tree_add_item(tree, hf_cip_sc_get_attribute_all_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
return;
}
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
for (attribute_list = wmem_list_head(gaa_val->attributes);
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
(attribute_list != NULL);
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
attribute_list = wmem_list_frame_next(attribute_list))
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
{
cip: fix a leak Change g_list into wmem_list to solve the leak. Leak found by valgrind. ==14755== 3,384 (504 direct, 2,880 indirect) bytes in 21 blocks are definitely lost in loss record 3,380 of 3,418 ==14755== at 0x4C2AB80: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==14755== by 0xA806610: g_malloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA81C22D: g_slice_alloc (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0xA7FD4F3: g_list_append (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4002.0) ==14755== by 0x67CD825: build_get_attr_all_table (packet-cip.c:5402) ==14755== by 0x67CD825: proto_register_cip (packet-cip.c:8067) ==14755== by 0x71C83F9: register_all_protocols (register.c:229) ==14755== by 0x65F14D7: proto_init (proto.c:521) ==14755== by 0x65CF961: epan_init (epan.c:126) ==14755== by 0x1153F0: main (tshark.c:1220) Change-Id: I9c25ee5b5bf04b9afb8b0bf22bb6f3d7022bf4d3 Reviewed-on: https://code.wireshark.org/review/13969 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-16 13:19:42 +00:00
attr = (attribute_info_t *)wmem_list_frame_data(attribute_list);
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
len_remain = tvb_reported_length_remaining(tvb, offset);
/* If there are no more attributes defined or there is no data left. */
if (attr == NULL || len_remain <= 0)
break;
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
att_item = proto_tree_add_uint_format_value(tree, hf_cip_attribute16, tvb, offset, 0, attr->attribute, "%d (%s)", attr->attribute, attr->text);
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
att_tree = proto_item_add_subtree(att_item, ett_cip_get_attributes_all_item);
att_size = dissect_cip_attribute(pinfo, att_tree, att_item, tvb, attr, offset, len_remain);
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
proto_item_set_len(att_item, att_size);
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
offset += att_size;
}
/* Add whatever is left as raw data. */
len_remain = tvb_reported_length_remaining(tvb, offset);
if (len_remain > 0)
{
proto_tree_add_item(tree, hf_cip_sc_get_attribute_all_data, tvb, offset, len_remain, ENC_NA);
}
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static void
dissect_cip_get_attribute_list_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item,
int offset, cip_simple_request_info_t* req_data)
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
int i, start_offset, att_count,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_value, att_status;
guint att_size;
attribute_info_t* attr;
proto_item *att_list, *att_item;
proto_tree *att_tree, *att_list_tree;
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
/* Get attribute list response */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (tvb_reported_length_remaining(tvb, offset) < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_serv_gal);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return;
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add number of attributes */
att_count = tvb_get_letohs( tvb, offset);
proto_tree_add_item(tree, hf_cip_sc_get_attr_list_attr_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add Attribute List */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
att_list_tree = proto_tree_add_subtree(tree, tvb, offset+2, att_count*4, ett_cip_get_attribute_list, &att_list, "Attribute List" );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
offset += 2;
start_offset = offset;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
for( i=0; i < att_count; i++ )
{
att_value = tvb_get_letohs( tvb, offset);
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
att_item = proto_tree_add_item(att_list_tree, hf_cip_attribute16, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_tree = proto_item_add_subtree( att_item, ett_cip_get_attribute_list_item);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_status = tvb_get_letohs( tvb, offset+2);
proto_tree_add_item(att_tree, hf_cip_sc_get_attr_list_attr_status, tvb, offset+2, 2, ENC_LITTLE_ENDIAN);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attr = cip_get_attribute(req_data->iClass, req_data->iInstance, att_value);
if (attr != NULL)
proto_item_append_text(att_item, " (%s)", attr->text);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
offset += 4;
if (att_status == 0)
{
if (attr != NULL)
{
/* provide attribute data */
att_size = dissect_cip_attribute(pinfo, att_tree, att_item, tvb, attr, offset, tvb_reported_length_remaining(tvb, offset));
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
offset += att_size;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_set_len(att_item, att_size+4);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
}
else
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Can't find the attribute, treat the rest of the response as raw data */
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
proto_tree_add_item(att_list_tree, hf_cip_sc_get_attr_list_attr_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
}
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ((tvb_reported_length_remaining(tvb, offset) < 4) && (i < att_count-1))
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, att_list, &ei_mal_serv_gal_count);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
}
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_set_len(att_list, offset-start_offset );
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static void
dissect_cip_set_attribute_list_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item,
int offset, cip_simple_request_info_t* req_data)
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
int i, start_offset, att_count, att_value;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attribute_info_t* attr;
proto_item *att_list, *att_item;
proto_tree *att_tree, *att_list_tree;
/* Get attribute list request */
if (tvb_reported_length_remaining(tvb, offset) < 2)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_serv_sal);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add number of attributes */
att_count = tvb_get_letohs( tvb, offset);
proto_tree_add_item(tree, hf_cip_sc_set_attr_list_attr_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
/* Add Attribute List */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
att_list_tree = proto_tree_add_subtree(tree, tvb, offset+2, att_count*4, ett_cip_get_attribute_list, &att_list, "Attribute List" );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
offset += 2;
start_offset = offset;
for( i=0; i < att_count; i++ )
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_value = tvb_get_letohs( tvb, offset);
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
att_item = proto_tree_add_item(att_list_tree, hf_cip_attribute16, tvb, offset, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
att_tree = proto_item_add_subtree( att_item, ett_cip_set_attribute_list_item);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(att_tree, hf_cip_sc_set_attr_list_attr_status, tvb, offset+2, 2, ENC_LITTLE_ENDIAN);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attr = cip_get_attribute(req_data->iClass, req_data->iInstance, att_value);
if (attr != NULL)
proto_item_append_text(att_item, " (%s)", attr->text);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
offset += 4;
if ((tvb_reported_length_remaining(tvb, offset) < 4) && (i < att_count-1))
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, att_list, &ei_mal_serv_sal_count);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
}
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_set_len(att_list, offset-start_offset );
}
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static void
dissect_cip_get_attribute_single_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item,
int offset, cip_simple_request_info_t* req_data)
{
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
int parsed_len = 0;
int total_len;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attribute_info_t* attr;
Moved setting of length2 to make it always set. svn path=/trunk/; revision=28777
2009-06-19 05:45:40 +00:00
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
total_len = tvb_reported_length_remaining(tvb, offset);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
attr = cip_get_attribute(req_data->iClass, req_data->iInstance, req_data->iAttribute);
if (attr != NULL)
{
proto_item_append_text(item, " (%s)", attr->text);
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
parsed_len = dissect_cip_attribute(pinfo, tree, item, tvb, attr, offset, total_len);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
if (total_len - parsed_len > 0)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
/* Can't find the attribute or there is leftover data, treat the rest of the response as raw data */
proto_tree_add_item(tree, hf_cip_sc_get_attr_single_data, tvb, offset + parsed_len, total_len - parsed_len, ENC_NA);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static void
dissect_cip_find_next_object_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item * item, int offset)
{
guint8 i, num_instances;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (tvb_reported_length_remaining(tvb, offset) < 1)
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_serv_find_next_object);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
num_instances = tvb_get_guint8( tvb, offset);
proto_tree_add_item(tree, hf_cip_find_next_object_num_instances, tvb, offset, 1, ENC_LITTLE_ENDIAN);
offset += 1;
for (i = 0; i < num_instances; i++)
{
proto_tree_add_item(tree, hf_cip_find_next_object_instance_item, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ((tvb_reported_length_remaining(tvb, offset) < 2) && (i < num_instances-1))
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, item, &ei_mal_serv_find_next_object_count);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
}
}
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
static int
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
dissect_cip_generic_service_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item *cmd_data_item;
proto_tree *cmd_data_tree;
cip_req_info_t* preq_info;
cip_simple_request_info_t req_data;
int offset = 0,
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
item_length = tvb_reported_length(tvb);
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
guint8 service = tvb_get_guint8( tvb, offset ) & CIP_SC_MASK,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
add_stat_size = tvb_get_guint8( tvb, offset+3 ) * 2;
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
add_cip_service_to_info_column(pinfo, service, cip_sc_vals);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* If there is any command specific data create a sub-tree for it */
if( (item_length-4-add_stat_size ) != 0 )
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree(tree, tvb, offset+4+add_stat_size, item_length-4-add_stat_size,
ett_cmd_data, &cmd_data_item, val_to_str(service, cip_sc_vals , "Unknown Service (0x%02x)"));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_append_text(cmd_data_item, " (Response)");
}
else
{
/* PROTO_ITEM_SET_HIDDEN( ti ); */
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
preq_info = (cip_req_info_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ((preq_info != NULL) &&
(preq_info->ciaData != NULL))
{
memcpy(&req_data, preq_info->ciaData, sizeof(cip_simple_request_info_t));
}
else
{
req_data.iClass = (guint32)-1;
req_data.iInstance = (guint32)-1;
req_data.iAttribute = (guint32)-1;
req_data.iMember = (guint32)-1;
}
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
switch(service)
{
case SC_GET_ATT_ALL:
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
dissect_cip_get_attribute_all_rsp(tvb, pinfo, cmd_data_tree, offset+4+add_stat_size, &req_data);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case SC_SET_ATT_ALL:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_set_attribute_all_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_GET_ATT_LIST:
dissect_cip_get_attribute_list_rsp(tvb, pinfo, cmd_data_tree, cmd_data_item, offset+4+add_stat_size, &req_data);
break;
case SC_SET_ATT_LIST:
dissect_cip_set_attribute_list_rsp(tvb, pinfo, cmd_data_tree, cmd_data_item, offset+4+add_stat_size, &req_data);
break;
case SC_RESET:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_reset_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_START:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_start_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_STOP:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_stop_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_CREATE:
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_sc_create_instance, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_sc_create_data, tvb, offset+4+add_stat_size+2, tvb_reported_length_remaining(tvb, offset+4+add_stat_size+2), ENC_NA);
break;
case SC_DELETE:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_delete_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_MULT_SERV_PACK:
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
dissect_cip_multiple_service_packet(tvb, pinfo, cmd_data_tree, cmd_data_item, offset+4+add_stat_size, FALSE);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case SC_APPLY_ATTRIBUTES:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_apply_attributes_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_GET_ATT_SINGLE:
dissect_cip_get_attribute_single_rsp(tvb, pinfo, cmd_data_tree, cmd_data_item, offset+4+add_stat_size, &req_data);
break;
case SC_SET_ATT_SINGLE:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_set_attr_single_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_FIND_NEXT_OBJ_INST:
dissect_cip_find_next_object_rsp(tvb, pinfo, cmd_data_tree, cmd_data_item, offset+4+add_stat_size);
break;
case SC_RESTOR:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_restore_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_SAVE:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_save_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_NO_OP:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_noop_data, tvb, offset+4+add_stat_size, tvb_reported_length_remaining(tvb, offset+4+add_stat_size), ENC_NA);
break;
case SC_GET_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_get_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_SET_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_set_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_INSERT_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_insert_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_REMOVE_MEMBER:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_remove_member_data, tvb, offset, tvb_reported_length_remaining(tvb, offset), ENC_NA);
break;
case SC_GROUP_SYNC:
proto_tree_add_item(cmd_data_tree, hf_cip_sc_group_sync_is_sync, tvb, offset+4+add_stat_size, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_sc_group_sync_data, tvb, offset+4+add_stat_size+1, tvb_reported_length_remaining(tvb, offset+4+add_stat_size+1), ENC_NA);
break;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
/************************************************
*
* Dissector for CIP Connection Manager
*
************************************************/
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
static void
dissect_cip_cm_timeout(proto_tree *cmd_tree, tvbuff_t *tvb, int offset)
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
guint8 tick, timeout_tick;
int timeout;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the priority/tick timer */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
tick = tvb_get_guint8( tvb, offset) & 0x0F;
proto_tree_add_item( cmd_tree, hf_cip_cm_priority, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item( cmd_tree, hf_cip_cm_tick_time, tvb, offset, 1, ENC_LITTLE_ENDIAN);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the time-out ticks */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
timeout_tick = tvb_get_guint8( tvb, offset+1 );
proto_tree_add_item( cmd_tree, hf_cip_cm_timeout_tick, tvb, offset+1, 1, ENC_LITTLE_ENDIAN);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the actual time out */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
timeout = ( 1 << tick ) * timeout_tick;
proto_tree_add_uint_format_value(cmd_tree, hf_cip_cm_timeout, tvb, offset, 2, timeout, "%dms", timeout);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
static void
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
dissect_cip_cm_fwd_open_req(cip_req_info_t *preq_info, proto_tree *cmd_tree, tvbuff_t *tvb, int offset, gboolean large_fwd_open, packet_info *pinfo)
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item *pi;
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
proto_tree *epath_tree;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int conn_path_size, rpi, net_param_offset = 0;
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
guint32 O2TConnID, T2OConnID, DeviceSerialNumber;
guint16 ConnSerialNumber, VendorID;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
guint8 TransportClass_trigger, O2TType, T2OType;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6893 : 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. svn path=/trunk/; revision=41283
2012-03-02 03:39:16 +00:00
cip_simple_request_info_t connection_path;
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
cip_safety_epath_info_t safety_fwdopen;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
dissect_cip_cm_timeout(cmd_tree, tvb, offset);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
O2TConnID = tvb_get_letohl( tvb, offset+2 );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_tree, hf_cip_cm_ot_connid, tvb, offset+2, 4, ENC_LITTLE_ENDIAN);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
T2OConnID = tvb_get_letohl( tvb, offset+6 );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_tree, hf_cip_cm_to_connid, tvb, offset+6, 4, ENC_LITTLE_ENDIAN);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
ConnSerialNumber = tvb_get_letohs( tvb, offset+10 );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_tree, hf_cip_cm_conn_serial_num, tvb, offset+10, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
VendorID = tvb_get_letohs( tvb, offset+12 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( cmd_tree, hf_cip_cm_vendor, tvb, offset+12, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
DeviceSerialNumber = tvb_get_letohl( tvb, offset+14 );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_tree, hf_cip_cm_orig_serial_num, tvb, offset+14, 4, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( cmd_tree, hf_cip_cm_timeout_multiplier, tvb, offset+18, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item( cmd_tree, hf_cip_reserved24, tvb, offset+19, 3, ENC_LITTLE_ENDIAN);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display originator to target requested packet interval */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
rpi = tvb_get_letohl( tvb, offset+22 );
proto_tree_add_uint_format_value(cmd_tree, hf_cip_cm_ot_rpi, tvb, offset+22, 4, rpi, "%dms (0x%08X)", rpi / 1000, rpi);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Display originator to target network connection parameters as a tree */
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
if (large_fwd_open)
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_net_param32(tvb, offset+26, cmd_tree,
hf_cip_cm_ot_net_params32, hf_cip_cm_lfwo_own, hf_cip_cm_lfwo_typ,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cm_lfwo_prio, hf_cip_cm_lfwo_fixed_var, hf_cip_cm_lfwo_con_size, ett_cm_ncp);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
O2TType = (guint8)(((tvb_get_letohl( tvb, offset+26 ) & 0x60000000) >> 29) & 3);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
net_param_offset = 4;
}
else
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_net_param16(tvb, offset+26, cmd_tree,
hf_cip_cm_ot_net_params16, hf_cip_cm_fwo_own, hf_cip_cm_fwo_typ,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cm_fwo_prio, hf_cip_cm_fwo_fixed_var, hf_cip_cm_fwo_con_size, ett_cm_ncp);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
O2TType = (guint8)(((tvb_get_letohs( tvb, offset+26 ) & 0x6000) >> 13) & 3);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
net_param_offset = 2;
}
/* Display target to originator requested packet interval */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
rpi = tvb_get_letohl( tvb, offset+26+net_param_offset );
proto_tree_add_uint_format_value(cmd_tree, hf_cip_cm_to_rpi, tvb, offset+26+net_param_offset, 4, rpi, "%dms (0x%08X)", rpi / 1000, rpi);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Display target to originator network connection parameters as a tree */
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
if (large_fwd_open)
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_net_param32(tvb, offset+26+net_param_offset+4, cmd_tree,
hf_cip_cm_to_net_params32, hf_cip_cm_lfwo_own, hf_cip_cm_lfwo_typ,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cm_lfwo_prio, hf_cip_cm_lfwo_fixed_var, hf_cip_cm_lfwo_con_size, ett_cm_ncp);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
T2OType = (guint8)(((tvb_get_letohl( tvb, offset+26+net_param_offset+4 ) & 0x60000000) >> 29) & 3);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
net_param_offset += 4;
}
else
{
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_net_param16(tvb, offset+26+net_param_offset+4, cmd_tree,
hf_cip_cm_to_net_params16, hf_cip_cm_fwo_own, hf_cip_cm_fwo_typ,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cm_fwo_prio, hf_cip_cm_fwo_fixed_var, hf_cip_cm_fwo_con_size, ett_cm_ncp);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
T2OType = (guint8)(((tvb_get_letohs( tvb, offset+26+net_param_offset+4 ) & 0x6000) >> 13) & 3);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
net_param_offset += 2;
}
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
TransportClass_trigger = tvb_get_guint8( tvb, offset+26+net_param_offset+4);
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_transport_type_trigger(tvb, offset+26+net_param_offset+4, cmd_tree, hf_cip_cm_transport_type_trigger,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cm_fwo_dir, hf_cip_cm_fwo_trigg, hf_cip_cm_fwo_class, ett_cm_ttt);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Add path size */
conn_path_size = tvb_get_guint8( tvb, offset+26+net_param_offset+5 )*2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_uint_format_value(cmd_tree, hf_cip_cm_conn_path_size, tvb, offset+26+net_param_offset+5, 1, conn_path_size/2, "%d (words)", conn_path_size/2);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Add the epath */
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
epath_tree = proto_tree_add_subtree(cmd_tree, tvb, offset+26+net_param_offset+6, conn_path_size, ett_path, &pi, "Connection Path: ");
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath( tvb, pinfo, epath_tree, pi, offset+26+net_param_offset+6, conn_path_size, FALSE, FALSE, &connection_path, &safety_fwdopen, DISPLAY_CONNECTION_PATH, NULL, FALSE);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
if (pinfo->fd->flags.visited)
{
Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 02:58:48 +00:00
/* "Connection" is created during ForwardOpen reply (which will be after ForwardOpen request),
so ForwardOpen request can only be marked after the first pass */
enip_mark_connection_triad(pinfo, ConnSerialNumber, VendorID, DeviceSerialNumber);
}
else
{
if (preq_info != NULL)
{
DISSECTOR_ASSERT(preq_info->connInfo == NULL);
preq_info->connInfo = wmem_new0(wmem_file_scope(), cip_conn_info_t);
preq_info->connInfo->ConnSerialNumber = ConnSerialNumber;
preq_info->connInfo->VendorID = VendorID;
preq_info->connInfo->DeviceSerialNumber = DeviceSerialNumber;
Add the packet number to the packet_info structure, and use it. 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>
2016-01-24 03:40:51 +00:00
preq_info->connInfo->forward_open_frame = pinfo->num;
Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 02:58:48 +00:00
preq_info->connInfo->O2T.connID = O2TConnID;
preq_info->connInfo->T2O.connID = T2OConnID;
preq_info->connInfo->TransportClass_trigger = TransportClass_trigger;
preq_info->connInfo->T2O.type = T2OType;
preq_info->connInfo->O2T.type = O2TType;
preq_info->connInfo->motion = (connection_path.iClass == 0x42) ? TRUE : FALSE;
preq_info->connInfo->safety = safety_fwdopen;
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
preq_info->connInfo->ClassID = connection_path.iClass;
Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 02:58:48 +00:00
}
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
}
}
static void
dissect_cip_cm_fwd_open_rsp_success(cip_req_info_t *preq_info, proto_tree *tree, tvbuff_t *tvb, int offset, packet_info *pinfo)
{
int temp_data;
unsigned char app_rep_size;
guint32 O2TConnID, T2OConnID, DeviceSerialNumber;
guint16 ConnSerialNumber, VendorID;
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
proto_tree *pid_tree, *safety_tree;
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
/* Display originator to target connection ID */
O2TConnID = tvb_get_letohl( tvb, offset );
proto_tree_add_item( tree, hf_cip_cm_ot_connid, tvb, offset, 4, ENC_LITTLE_ENDIAN);
/* Display target to originator connection ID */
T2OConnID = tvb_get_letohl( tvb, offset+4 );
proto_tree_add_item( tree, hf_cip_cm_to_connid, tvb, offset+4, 4, ENC_LITTLE_ENDIAN);
/* Display connection serial number */
ConnSerialNumber = tvb_get_letohs( tvb, offset+8 );
proto_tree_add_item( tree, hf_cip_cm_conn_serial_num, tvb, offset+8, 2, ENC_LITTLE_ENDIAN);
/* Display the originator vendor id */
VendorID = tvb_get_letohs( tvb, offset+10 );
proto_tree_add_item( tree, hf_cip_cm_vendor, tvb, offset+10, 2, ENC_LITTLE_ENDIAN);
/* Display the originator serial number */
DeviceSerialNumber = tvb_get_letohl( tvb, offset+12 );
proto_tree_add_item( tree, hf_cip_cm_orig_serial_num, tvb, offset+12, 4, ENC_LITTLE_ENDIAN);
/* Display originator to target actual packet interval */
temp_data = tvb_get_letohl( tvb, offset+16 );
proto_tree_add_uint_format_value(tree, hf_cip_cm_ot_api, tvb, offset+16, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
/* Display originator to target actual packet interval */
temp_data = tvb_get_letohl( tvb, offset+20 );
proto_tree_add_uint_format_value(tree, hf_cip_cm_to_api, tvb, offset+20, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
/* Display the application reply size */
app_rep_size = tvb_get_guint8( tvb, offset+24 ) * 2;
proto_tree_add_uint_format_value(tree, hf_cip_cm_app_reply_size, tvb, offset+24, 1, app_rep_size / 2, "%d (words)", app_rep_size / 2);
/* Display the Reserved byte */
proto_tree_add_item(tree, hf_cip_reserved8, tvb, offset+25, 1, ENC_LITTLE_ENDIAN );
if (app_rep_size > 0)
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
{
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
if ((preq_info == NULL) || (preq_info->connInfo == NULL) ||
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
(preq_info->connInfo->safety.safety_seg == FALSE))
{
proto_tree_add_item(tree, hf_cip_cm_app_reply_data, tvb, offset+26, app_rep_size, ENC_NA );
}
else if (preq_info->connInfo->safety.format == CIP_SAFETY_BASE_FORMAT)
{
CIP: More minor bug fixes 1. CIP Safety: Exception Detail Alarm and Exception Detail Warning both were not parsing their 3 parts because the offset was not increased. Fixed the offsets and combined the functions because they have the same format. 2. CIP: Forward Open Safety Response had wrong offsets so it was parsing incorrectly. This incorrectly showed as Malformed. 3. CIP Safety: Pass in tvb to proto_tree_add_subtree() instead of NULL. This was causing a Dissector bug (seems only on trunk, not 2.2). This was already done for packet-cip.c under https://code.wireshark.org/review/#/c/16748/ 4. Some minor typos Change-Id: I63e8d200cd3408c16ca0a1edbc483c3bb8298d3b Reviewed-on: https://code.wireshark.org/review/18100 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>
2016-10-06 18:40:28 +00:00
safety_tree = proto_tree_add_subtree( tree, tvb, offset+26, 10, ett_cip_cm_safety, NULL, "Safety Application Reply Data");
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
proto_tree_add_item( safety_tree, hf_cip_cm_consumer_number, tvb, offset+26, 2, ENC_LITTLE_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
pid_tree = proto_tree_add_subtree( safety_tree, tvb, offset+28, 8, ett_cip_cm_pid, NULL, "PID/CID");
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
proto_tree_add_item( pid_tree, hf_cip_cm_targ_vendor_id, tvb, offset+28, 2, ENC_LITTLE_ENDIAN);
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
proto_tree_add_item( pid_tree, hf_cip_cm_targ_dev_serial_num, tvb, offset+30, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item( pid_tree, hf_cip_cm_targ_conn_serial_num, tvb, offset+34, 2, ENC_LITTLE_ENDIAN);
if (app_rep_size > 10)
proto_tree_add_item(tree, hf_cip_cm_app_reply_data, tvb, offset+36, app_rep_size-10, ENC_NA );
}
else if (preq_info->connInfo->safety.format == CIP_SAFETY_EXTENDED_FORMAT)
{
CIP: More minor bug fixes 1. CIP Safety: Exception Detail Alarm and Exception Detail Warning both were not parsing their 3 parts because the offset was not increased. Fixed the offsets and combined the functions because they have the same format. 2. CIP: Forward Open Safety Response had wrong offsets so it was parsing incorrectly. This incorrectly showed as Malformed. 3. CIP Safety: Pass in tvb to proto_tree_add_subtree() instead of NULL. This was causing a Dissector bug (seems only on trunk, not 2.2). This was already done for packet-cip.c under https://code.wireshark.org/review/#/c/16748/ 4. Some minor typos Change-Id: I63e8d200cd3408c16ca0a1edbc483c3bb8298d3b Reviewed-on: https://code.wireshark.org/review/18100 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>
2016-10-06 18:40:28 +00:00
safety_tree = proto_tree_add_subtree( tree, tvb, offset+26, 14, ett_cip_cm_safety, NULL, "Safety Application Reply Data");
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
proto_tree_add_item( safety_tree, hf_cip_cm_consumer_number, tvb, offset+26, 2, ENC_LITTLE_ENDIAN);
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
pid_tree = proto_tree_add_subtree( safety_tree, tvb, offset+28, 12, ett_cip_cm_pid, NULL, "PID/CID");
whitespace fixes; mostly: remove trailing blanks svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
proto_tree_add_item( pid_tree, hf_cip_cm_targ_vendor_id, tvb, offset+28, 2, ENC_LITTLE_ENDIAN);
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
proto_tree_add_item( pid_tree, hf_cip_cm_targ_dev_serial_num, tvb, offset+30, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item( pid_tree, hf_cip_cm_targ_conn_serial_num, tvb, offset+34, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( pid_tree, hf_cip_cm_initial_timestamp, tvb, offset+36, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item( pid_tree, hf_cip_cm_initial_rollover, tvb, offset+38, 2, ENC_LITTLE_ENDIAN);
if (app_rep_size > 14)
proto_tree_add_item(tree, hf_cip_cm_app_reply_data, tvb, offset+40, app_rep_size-14, ENC_NA );
}
}
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
/* See if we've captured the ForwardOpen request. If so some of the conversation data has already been
populated and we just need to update it. */
if (pinfo->fd->flags.visited)
return;
if ((preq_info != NULL) && (preq_info->connInfo != NULL))
{
/* Ensure the connection triad matches before updating the connection IDs */
if ((preq_info->connInfo->ConnSerialNumber == ConnSerialNumber) &&
(preq_info->connInfo->VendorID == VendorID) &&
(preq_info->connInfo->DeviceSerialNumber == DeviceSerialNumber))
{
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
/* Update the connection IDs as ForwardOpen reply is allowed to update them from
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
the ForwardOpen request */
preq_info->connInfo->O2T.connID = O2TConnID;
preq_info->connInfo->T2O.connID = T2OConnID;
}
}
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
static void display_previous_request_path(cip_req_info_t *preq_info, proto_tree *item_tree, tvbuff_t *tvb, packet_info *pinfo, proto_item* msp_item, gboolean is_msp_item)
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
{
if (preq_info && preq_info->IOILen && preq_info->pIOI)
{
proto_item *pi;
proto_tree *epath_tree;
tvbuff_t* tvbIOI;
tvbIOI = tvb_new_real_data((const guint8 *)preq_info->pIOI, preq_info->IOILen * 2, preq_info->IOILen * 2);
if (tvbIOI)
{
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
pi = proto_tree_add_uint_format_value(item_tree, hf_cip_request_path_size, tvb, 0, 0, preq_info->IOILen, "%d (words)", preq_info->IOILen);
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
PROTO_ITEM_SET_GENERATED(pi);
/* Add the epath */
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
epath_tree = proto_tree_add_subtree(item_tree, tvb, 0, 0, ett_path, &pi, "Request Path: ");
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
PROTO_ITEM_SET_GENERATED(pi);
if (preq_info->ciaData == NULL)
{
preq_info->ciaData = wmem_new(wmem_file_scope(), cip_simple_request_info_t);
}
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvbIOI, pinfo, epath_tree, pi, 0, preq_info->IOILen * 2, TRUE, FALSE, preq_info->ciaData, NULL, DISPLAY_REQUEST_PATH, msp_item, is_msp_item);
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
tvb_free(tvbIOI);
}
}
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static void
dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_length, packet_info *pinfo )
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
proto_item *pi, *rrsc_item, *status_item, *temp_item;
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
proto_tree *rrsc_tree, *cmd_data_tree, *status_tree, *add_status_tree, *temp_tree, *epath_tree;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
int req_path_size, conn_path_size, temp_data;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
unsigned char service, gen_status, add_stat_size;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
unsigned short add_status;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
unsigned char app_rep_size, route_path_size;
int i, msg_req_siz;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
cip_req_info_t *preq_info;
cip_req_info_t *pembedded_req_info;
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
guint16 ConnSerialNumber, VendorID;
guint32 DeviceSerialNumber;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
service = tvb_get_guint8( tvb, offset );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Special handling for Unconnected send response. If successful, embedded service code is sent.
* If failed, it can be either an Unconnected send response or the embedded service code response. */
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
preq_info = (cip_req_info_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0 );
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if ( preq_info != NULL && ( service & CIP_SC_RESPONSE_MASK )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
&& preq_info->bService == SC_CM_UNCON_SEND
)
{
gen_status = tvb_get_guint8( tvb, offset+2 );
add_stat_size = tvb_get_guint8( tvb, offset+3 ) * 2;
if ( add_stat_size == 2 )
add_status = tvb_get_letohs( tvb, offset + 4 );
else
add_status = 0;
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
if( gen_status == CI_GRC_SUCCESS
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
|| ( ( service & CIP_SC_MASK ) != SC_CM_UNCON_SEND )
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
|| !( ( gen_status == CI_GRC_FAILURE && (add_status == CM_ES_UNCONNECTED_REQUEST_TIMED_OUT ||
add_status == CM_ES_PORT_NOT_AVAILABLE ||
add_status == CM_ES_LINK_ADDRESS_NOT_VALID ||
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
add_status == CM_ES_INVALID_SEGMENT_IN_CONN_PATH ||
add_status == CM_ES_LINK_ADDRESS_TO_SELF_INVALID))
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
|| gen_status == CI_GRC_NO_RESOURCE
|| gen_status == CI_GRC_BAD_PATH
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
)
)
{
pembedded_req_info = (cip_req_info_t*)preq_info->pData;
if ( pembedded_req_info )
{
tvbuff_t *next_tvb;
void *p_save_proto_data;
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
gint service_index;
heur_dtbl_entry_t *hdtbl_entry;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
p_save_proto_data = p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0 );
p_remove_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
p_add_proto_data(wmem_file_scope(), pinfo, proto_cip, 0, pembedded_req_info );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
proto_tree_add_uint_format( item_tree, hf_cip_cm_sc, tvb, 0, 0, SC_CM_UNCON_SEND|CIP_SC_RESPONSE_MASK, "(Service: Unconnected Send (Response))" );
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. 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-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset, item_length);
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
display_previous_request_path(pembedded_req_info, item_tree, tvb, pinfo, NULL, FALSE);
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
/* Check to see if service is 'generic' */
try_val_to_str_idx((service & CIP_SC_MASK), cip_sc_vals, &service_index);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if ( pembedded_req_info && pembedded_req_info->dissector )
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
{
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
call_dissector(pembedded_req_info->dissector, next_tvb, pinfo, item_tree );
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
}
else if (service_index >= 0)
{
/* See if object dissector wants to override generic service handling */
if (!dissector_try_heuristic(heur_subdissector_service, tvb, pinfo, item_tree, &hdtbl_entry, NULL))
{
dissect_cip_generic_service_rsp(tvb, pinfo, item_tree);
}
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
else
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
{
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
call_dissector( cip_class_generic_handle, next_tvb, pinfo, item_tree );
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
p_remove_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
p_add_proto_data(wmem_file_scope(), pinfo, proto_cip, 0, p_save_proto_data);
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
/* Return early because the response was only the embedded message response. */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
return;
}
}
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP CM");
/* Add Service code & Request/Response tree */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
rrsc_tree = proto_tree_add_subtree( item_tree, tvb, offset, 1, ett_cm_rrsc, &rrsc_item, "Service: " );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add Request/Response */
proto_tree_add_item( rrsc_tree, hf_cip_reqrsp, tvb, offset, 1, ENC_LITTLE_ENDIAN );
/* watch for service collisions */
proto_item_append_text( rrsc_item, "%s (%s)",
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
val_to_str( ( service & CIP_SC_MASK ),
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
cip_sc_vals_cm , "Unknown Service (0x%02x)"),
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
val_to_str_const( ( service & CIP_SC_RESPONSE_MASK )>>7,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
cip_sc_rr, "") );
/* Add Service code */
proto_tree_add_item(rrsc_tree, hf_cip_cm_sc, tvb, offset, 1, ENC_LITTLE_ENDIAN );
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
add_cip_service_to_info_column(pinfo, service, cip_sc_vals_cm);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if( service & CIP_SC_RESPONSE_MASK )
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
/* Response message */
gen_status = tvb_get_guint8( tvb, offset+2 );
add_stat_size = tvb_get_guint8( tvb, offset+3 ) * 2;
if (gen_status == CI_GRC_FAILURE)
{
/* Dissect object specific error codes */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
status_tree = proto_tree_add_subtree(item_tree, tvb, offset+2, 1, ett_status_item, &status_item, "Status: " );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add general status */
proto_tree_add_item(status_tree, hf_cip_cm_genstat, tvb, offset+2, 1, ENC_LITTLE_ENDIAN );
proto_item_append_text( status_item, "%s", val_to_str_ext( gen_status,
&cip_gs_vals_ext , "Unknown Response (%x)") );
/* Add additional status size */
proto_tree_add_uint_format_value(status_tree, hf_cip_cm_addstat_size,
From Michael Mann: Bugfixes for both Buildbot issues: 1. seg-fault with multiple_service_packet 2. infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519 svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
tvb, offset+3, 1, add_stat_size/2, "%d (words)", add_stat_size/2);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if( add_stat_size )
{
add_status = tvb_get_letohs( tvb, offset + 4 );
proto_tree_add_item(status_tree, hf_cip_cm_ext_status, tvb, offset+4, 2, ENC_LITTLE_ENDIAN );
proto_item_append_text(status_item, ", Extended: %s", val_to_str_ext(add_status, &cip_cm_ext_st_vals_ext, "Reserved (0x%04x)"));
switch(add_status)
{
case CM_ES_RPI_NOT_ACCEPTABLE:
From Michael Mann: Bugfixes for both Buildbot issues: 1. seg-fault with multiple_service_packet 2. infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519 svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
if (add_stat_size < 3)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_add_info(pinfo, status_item, &ei_mal_rpi_no_data);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
else
{
proto_tree_add_item(status_tree, hf_cip_cm_ext112_ot_rpi_type, tvb, offset+6, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(status_tree, hf_cip_cm_ext112_to_rpi_type, tvb, offset+7, 1, ENC_LITTLE_ENDIAN );
temp_data = tvb_get_letohl( tvb, offset+8);
proto_tree_add_uint_format_value(status_tree, hf_cip_cm_ext112_ot_rpi, tvb, offset+8, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
temp_data = tvb_get_letohl( tvb, offset+12);
proto_tree_add_uint_format_value(status_tree, hf_cip_cm_ext112_to_rpi, tvb, offset+12, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
}
break;
case CM_ES_INVALID_CONFIGURATION_SIZE:
Remove superfluous size checks (CID-1158694) Don't try to add expert items for size < 1 when this code isn't executed for size == 0. (note: size is unsigned) Change-Id: Ieb3d2593d4bb5f175ac368ef38571511b4f56f25 Reviewed-on: https://code.wireshark.org/review/15774 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>
2016-06-07 21:56:59 +00:00
proto_tree_add_item(status_tree, hf_cip_cm_ext126_size, tvb, offset+6, 2, ENC_LITTLE_ENDIAN );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case CM_ES_INVALID_OT_SIZE:
Remove superfluous size checks (CID-1158694) Don't try to add expert items for size < 1 when this code isn't executed for size == 0. (note: size is unsigned) Change-Id: Ieb3d2593d4bb5f175ac368ef38571511b4f56f25 Reviewed-on: https://code.wireshark.org/review/15774 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>
2016-06-07 21:56:59 +00:00
proto_tree_add_item(status_tree, hf_cip_cm_ext127_size, tvb, offset+6, 2, ENC_LITTLE_ENDIAN );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
case CM_ES_INVALID_TO_SIZE:
Remove superfluous size checks (CID-1158694) Don't try to add expert items for size < 1 when this code isn't executed for size == 0. (note: size is unsigned) Change-Id: Ieb3d2593d4bb5f175ac368ef38571511b4f56f25 Reviewed-on: https://code.wireshark.org/review/15774 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>
2016-06-07 21:56:59 +00:00
proto_tree_add_item(status_tree, hf_cip_cm_ext128_size, tvb, offset+6, 2, ENC_LITTLE_ENDIAN );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
break;
default:
/* Add additional status */
if (add_stat_size > 1)
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
add_status_tree = proto_tree_add_subtree( status_tree, tvb, offset+4, add_stat_size, ett_cm_add_status_item, NULL, "Additional Status" );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
From Michael Mann: Bugfixes for both Buildbot issues: 1. seg-fault with multiple_service_packet 2. infinite loop https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6519 svn path=/trunk/; revision=39843
2011-11-15 07:18:39 +00:00
for( i=0; i < add_stat_size-2; i += 2 )
proto_tree_add_item(add_status_tree, hf_cip_cm_add_status, tvb, offset+4+i, 2, ENC_LITTLE_ENDIAN );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
}
/* If there is any command specific data create a sub-tree for it */
if( ( item_length-4-add_stat_size ) != 0 )
{
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
proto_item *cmd_item;
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree( item_tree, tvb, offset+4+add_stat_size, item_length-4-add_stat_size,
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
ett_cm_cmd_data, &cmd_item, "Command Specific Data" );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if( gen_status == CI_GRC_SUCCESS || gen_status == CI_GRC_SERVICE_ERROR )
{
/* Success responses */
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
switch (service & CIP_SC_MASK)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
case SC_CM_FWD_OPEN:
case SC_CM_LARGE_FWD_OPEN:
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
dissect_cip_cm_fwd_open_rsp_success(preq_info, cmd_data_tree, tvb, offset+4+add_stat_size, pinfo);
break;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
case SC_CM_FWD_CLOSE:
{
/* Forward close response (Success) */
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display connection serial number */
ConnSerialNumber = tvb_get_letohs( tvb, offset+4+add_stat_size );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN);
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the originator vendor id */
VendorID = tvb_get_letohs( tvb, offset+4+add_stat_size+2 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_vendor, tvb, offset+4+add_stat_size+2, 2, ENC_LITTLE_ENDIAN);
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the originator serial number */
DeviceSerialNumber = tvb_get_letohl( tvb, offset+4+add_stat_size+4 );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+4, 4, ENC_LITTLE_ENDIAN);
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the application reply size */
app_rep_size = tvb_get_guint8( tvb, offset+4+add_stat_size+8 ) * 2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_uint_format_value(cmd_data_tree, hf_cip_cm_app_reply_size, tvb, offset+4+add_stat_size+8, 1, app_rep_size / 2, "%d (words)", app_rep_size / 2);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Display the Reserved byte */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+9, 1, ENC_LITTLE_ENDIAN);
if (app_rep_size > 0)
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
{
if (tvb_reported_length_remaining(tvb, offset + 4 + add_stat_size + 10) <= app_rep_size)
{
expert_add_info(pinfo, cmd_item, &ei_mal_fwd_close_missing_data);
break;
}
proto_tree_add_item(cmd_data_tree, hf_cip_cm_app_reply_data, tvb, offset+4+add_stat_size+10,app_rep_size, ENC_NA);
}
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
enip_close_cip_connection( pinfo, ConnSerialNumber, VendorID, DeviceSerialNumber );
} /* End of if forward close response */
break;
case SC_CM_UNCON_SEND:
{
/* Unconnected send response (Success) */
/* Display service response data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
break;
case SC_CM_GET_CONN_OWNER:
{
/* Get Connection owner response (Success) */
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_conn, tvb, offset+4+add_stat_size, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_coo_conn, tvb, offset+4+add_stat_size+1, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_roo_conn, tvb, offset+4+add_stat_size+2, 1, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_gco_last_action, tvb, offset+4+add_stat_size+3, 1, ENC_LITTLE_ENDIAN);
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size+4, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_vendor, tvb, offset+4+add_stat_size+6, 2, ENC_LITTLE_ENDIAN);
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+8, 4, ENC_LITTLE_ENDIAN);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
break;
default:
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add data */
Fix some more hf encodings. svn path=/trunk/; revision=42434
2012-05-05 00:19:49 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
else
{
/* Error responses */
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
switch (service & CIP_SC_MASK)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
case SC_CM_FWD_OPEN:
case SC_CM_LARGE_FWD_OPEN:
case SC_CM_FWD_CLOSE:
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Forward open and forward close error response look the same */
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
ConnSerialNumber = tvb_get_letohs( tvb, offset+4+add_stat_size );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
VendorID = tvb_get_letohs( tvb, offset+4+add_stat_size+2 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_vendor, tvb, offset+4+add_stat_size+2, 2, ENC_LITTLE_ENDIAN);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
DeviceSerialNumber = tvb_get_letohl( tvb, offset+4+add_stat_size+4 );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+4+add_stat_size+4, 4, ENC_LITTLE_ENDIAN);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_cm_remain_path_size, tvb, offset+4+add_stat_size+8, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+4+add_stat_size+9, 1, ENC_LITTLE_ENDIAN);
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
/* With an error reply the connection will either never be established or it has since already closed
That means the conversation should end too */
enip_close_cip_connection(pinfo, ConnSerialNumber, VendorID, DeviceSerialNumber);
if (preq_info != NULL)
{
/* Remove any connection information */
preq_info->connInfo = NULL;
}
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
case SC_CM_UNCON_SEND:
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Unconnected send response (Unsuccess) */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_cm_remain_path_size, tvb, offset+4+add_stat_size, 1, ENC_LITTLE_ENDIAN);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
default:
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
} /* end of if-else( CI_CRC_SUCCESS ) */
} /* End of if command-specific data present */
} /* End of if reply */
else
{
/* Request message */
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
/* If there is any command specific data creat a sub-tree for it */
if( (item_length-req_path_size-2) != 0 )
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree( item_tree, tvb, offset+2+req_path_size, item_length-req_path_size-2,
ett_cm_cmd_data, NULL, "Command Specific Data" );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Check what service code that received */
switch (service)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
case SC_CM_FWD_OPEN:
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Forward open Request*/
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
dissect_cip_cm_fwd_open_req(preq_info, cmd_data_tree, tvb, offset+2+req_path_size, FALSE, pinfo);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
case SC_CM_LARGE_FWD_OPEN:
/* Large Forward open Request*/
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
dissect_cip_cm_fwd_open_req(preq_info, cmd_data_tree, tvb, offset+2+req_path_size, TRUE, pinfo);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
case SC_CM_FWD_CLOSE:
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
{
cip_simple_request_info_t conn_path;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Forward Close Request */
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
dissect_cip_cm_timeout( cmd_data_tree, tvb, offset+2+req_path_size);
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_conn_serial_num, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 02:58:48 +00:00
ConnSerialNumber = tvb_get_letohs( tvb, offset+2+req_path_size+2);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_vendor, tvb, offset+2+req_path_size+4, 2, ENC_LITTLE_ENDIAN);
Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 02:58:48 +00:00
VendorID = tvb_get_letohs( tvb, offset+2+req_path_size+4 );
Get rid of check_col, while at it set ENC. svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
proto_tree_add_item( cmd_data_tree, hf_cip_cm_orig_serial_num, tvb, offset+2+req_path_size+6, 4, ENC_LITTLE_ENDIAN);
Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 02:58:48 +00:00
DeviceSerialNumber = tvb_get_letohl( tvb, offset+2+req_path_size+6 );
if (!pinfo->fd->flags.visited)
enip_mark_connection_triad(pinfo, ConnSerialNumber, VendorID, DeviceSerialNumber);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add the path size */
conn_path_size = tvb_get_guint8( tvb, offset+2+req_path_size+10 )*2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_uint_format_value(cmd_data_tree, hf_cip_cm_conn_path_size, tvb, offset+2+req_path_size+10, 1, conn_path_size/2, "%d (words)", conn_path_size/2);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the Reserved byte */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size+11, 1, ENC_LITTLE_ENDIAN);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add the EPATH */
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
epath_tree = proto_tree_add_subtree(cmd_data_tree, tvb, offset+2+req_path_size+12, conn_path_size, ett_path, &pi, "Connection Path: ");
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvb, pinfo, epath_tree, pi, offset + 2 + req_path_size + 12, conn_path_size, FALSE, FALSE, &conn_path, NULL, DISPLAY_CONNECTION_PATH, NULL, FALSE);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
}
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
case SC_CM_UNCON_SEND:
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
/* Unconnected send */
tvbuff_t *next_tvb;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display timeout fields */
dissect_cip_cm_timeout( cmd_data_tree, tvb, offset+2+req_path_size);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Message request size */
msg_req_siz = tvb_get_letohs( tvb, offset+2+req_path_size+2 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_cm_msg_req_size, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Message Request */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
temp_tree = proto_tree_add_subtree( cmd_data_tree, tvb, offset+2+req_path_size+4, msg_req_siz, ett_cm_mes_req, NULL, "Message Request" );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/*
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
** We call ourselves again to dissect embedded packet
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
*/
* Prefer col_append_str instead of col_append_fstr for constant strings * Remove check_col guards svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
col_append_str( pinfo->cinfo, COL_INFO, ": ");
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. 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-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length(tvb, offset+2+req_path_size+4, msg_req_siz);
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
preq_info = (cip_req_info_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0 );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
pembedded_req_info = NULL;
if ( preq_info )
{
if ( preq_info->pData == NULL )
{
Convert a few more dissectors to wmem svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
pembedded_req_info = wmem_new0(wmem_file_scope(), cip_req_info_t);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
preq_info->pData = pembedded_req_info;
}
else
{
pembedded_req_info = (cip_req_info_t*)preq_info->pData;
}
}
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_cip_data( temp_tree, next_tvb, 0, pinfo, pembedded_req_info, NULL, FALSE );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if( msg_req_siz % 2 )
{
/* Pad byte */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_pad8, tvb, offset+2+req_path_size+4+msg_req_siz, 1, ENC_LITTLE_ENDIAN);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
msg_req_siz++; /* include the padding */
}
/* Route Path Size */
route_path_size = tvb_get_guint8( tvb, offset+2+req_path_size+4+msg_req_siz )*2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_uint_format_value(cmd_data_tree, hf_cip_cm_route_path_size, tvb, offset+2+req_path_size+4+msg_req_siz, 1, route_path_size / 2, "%d (words)", route_path_size / 2);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the Reserved byte */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size+5+msg_req_siz, 1, ENC_LITTLE_ENDIAN);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Route Path */
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
epath_tree = proto_tree_add_subtree(cmd_data_tree, tvb, offset+2+req_path_size+6+msg_req_siz, route_path_size, ett_path, &temp_item, "Route Path: ");
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvb, pinfo, epath_tree, temp_item, offset+2+req_path_size+6+msg_req_siz, route_path_size, FALSE, FALSE, NULL, NULL, NO_DISPLAY, NULL, FALSE);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
break;
case SC_CM_GET_CONN_OWNER:
/* Get Connection Owner Request */
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
/* Display the Reserved byte */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_reserved8, tvb, offset+2+req_path_size, 1, ENC_LITTLE_ENDIAN);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Add path size */
conn_path_size = tvb_get_guint8( tvb, offset+2+req_path_size+1 )*2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_uint_format_value(cmd_data_tree, hf_cip_cm_conn_path_size, tvb, offset+2+req_path_size+1, 1, conn_path_size/2, "%d (words)", conn_path_size/2);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Add the epath */
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
epath_tree = proto_tree_add_subtree(cmd_data_tree, tvb, offset+2+req_path_size+2, conn_path_size, ett_path, &pi, "Connection Path: ");
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvb, pinfo, epath_tree, pi, offset+2+req_path_size+2, conn_path_size, FALSE, FALSE, NULL, NULL, NO_DISPLAY, NULL, FALSE);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
default:
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+2+req_path_size, item_length-req_path_size-2, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
} /* End of if command-specific data present */
} /* End of if-else( request ) */
} /* End of dissect_cip_cm_data() */
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_cip_class_cm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
proto_item *ti;
proto_tree *class_tree;
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
/* Create display subtree for the protocol */
ti = proto_tree_add_item(tree, proto_cip_class_cm, tvb, 0, -1, ENC_NA);
class_tree = proto_item_add_subtree( ti, ett_cip_class_cm );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
dissect_cip_cm_data( class_tree, tvb, 0, tvb_reported_length(tvb), pinfo );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
/************************************************
*
* Dissector for CIP Modbus Object
*
************************************************/
static void
dissect_cip_mb_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_length, packet_info *pinfo )
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
proto_item *rrsc_item;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
proto_tree *rrsc_tree, *cmd_data_tree;
tvbuff_t *next_tvb;
int req_path_size;
guint8 gen_status, add_stat_size, service;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP MB");
/* Add Service code & Request/Response tree */
service = tvb_get_guint8( tvb, offset );
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
rrsc_tree = proto_tree_add_subtree( item_tree, tvb, offset, 1, ett_mb_rrsc, &rrsc_item, "Service: " );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
/* Add Request/Response */
proto_tree_add_item( rrsc_tree, hf_cip_reqrsp, tvb, offset, 1, ENC_LITTLE_ENDIAN );
proto_item_append_text( rrsc_item, "%s (%s)",
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
val_to_str( ( service & CIP_SC_MASK ),
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
cip_sc_vals_mb , "Unknown Service (0x%02x)"),
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
val_to_str_const( ( service & CIP_SC_RESPONSE_MASK )>>7,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
cip_sc_rr, "") );
/* Add Service code */
proto_tree_add_item(rrsc_tree, hf_cip_mb_sc, tvb, offset, 1, ENC_LITTLE_ENDIAN );
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if( service & CIP_SC_RESPONSE_MASK )
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
{
/* Response message */
gen_status = tvb_get_guint8( tvb, offset+2 );
add_stat_size = tvb_get_guint8( tvb, offset+3 ) * 2;
/* If there is any command specific data create a sub-tree for it */
if( ( item_length-4-add_stat_size ) != 0 )
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree( item_tree, tvb, offset+4+add_stat_size, item_length-4-add_stat_size,
ett_mb_cmd_data, NULL, "Command Specific Data" );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
if( gen_status == CI_GRC_SUCCESS || gen_status == CI_GRC_SERVICE_ERROR )
{
/* Success responses */
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
switch (service & CIP_SC_MASK)
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
{
case SC_MB_READ_DISCRETE_INPUTS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_discrete_inputs_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
break;
case SC_MB_READ_COILS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_coils_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
break;
case SC_MB_READ_INPUT_REGISTERS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_input_register_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
break;
case SC_MB_READ_HOLDING_REGISTERS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_holding_register_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
break;
case SC_MB_WRITE_COILS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_coils_start_addr, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_coils_outputs_forced, tvb, offset+4+add_stat_size+2, 2, ENC_LITTLE_ENDIAN);
break;
case SC_MB_WRITE_HOLDING_REGISTERS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_registers_start_addr, tvb, offset+4+add_stat_size, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_registers_outputs_forced, tvb, offset+4+add_stat_size+2, 2, ENC_LITTLE_ENDIAN);
break;
case SC_MB_PASSTHROUGH:
/* Passthrough response (Success) */
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
if( tvb_reported_length_remaining(tvb, offset) > 0 )
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
{
Major Re-factoring of the dissector and some new features. A change-list is as follows: - Removed un-necessary dissector revision updates from the file header since GIT tracks these nicely. - Added proper size detection of Modbus RTU messages (including exception responses), when dealing with partial TCP segment reassembly. - Moved the 'register' decode preferences to the Modbus dissector as TCP vs. RTU granularity isn't needed in this case. - Obsoleted un-unused 'address type format' user preferences - Cleaned up dissect_modbus_data to remove proto_tree_set_text instances. - For decoded register tree objects, use register 'address' instead of 'value' for the filter field to provide a more useful filter. - Added in conversation support, to attempt to track responses back to matching requests. - Use conversation support to attempt to populate proper register address offsets in the response messages. Currently each request is saved and each response looks for the last prior request that matches the function code. - Re-factored Modbus dissector to split apart request vs. response decoding. This has led to cleaner code paths, but some duplication where replies and requests are identical format. Change-Id: I0c86ae85b8ae4cc59b037e5f68f408833205fadd Reviewed-on: https://code.wireshark.org/review/9914 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>
2015-08-07 17:18:00 +00:00
int packet_type = RESPONSE_PACKET;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
/* dissect the Modbus PDU */
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. 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-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length( tvb, offset+4+add_stat_size, item_length-4-add_stat_size);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
Major Re-factoring of the dissector and some new features. A change-list is as follows: - Removed un-necessary dissector revision updates from the file header since GIT tracks these nicely. - Added proper size detection of Modbus RTU messages (including exception responses), when dealing with partial TCP segment reassembly. - Moved the 'register' decode preferences to the Modbus dissector as TCP vs. RTU granularity isn't needed in this case. - Obsoleted un-unused 'address type format' user preferences - Cleaned up dissect_modbus_data to remove proto_tree_set_text instances. - For decoded register tree objects, use register 'address' instead of 'value' for the filter field to provide a more useful filter. - Added in conversation support, to attempt to track responses back to matching requests. - Use conversation support to attempt to populate proper register address offsets in the response messages. Currently each request is saved and each response looks for the last prior request that matches the function code. - Re-factored Modbus dissector to split apart request vs. response decoding. This has led to cleaner code paths, but some duplication where replies and requests are identical format. Change-Id: I0c86ae85b8ae4cc59b037e5f68f408833205fadd Reviewed-on: https://code.wireshark.org/review/9914 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>
2015-08-07 17:18:00 +00:00
/* Call Modbus Dissector */
call_dissector_with_data(modbus_handle, next_tvb, pinfo, cmd_data_tree, &packet_type );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
}
break;
default:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
}
}
else
{
proto_tree_add_item(cmd_data_tree, hf_cip_mb_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
}
} /* End of if command-specific data present */
} /* End of if reply */
else
{
/* Request message */
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
/* If there is any command specific data creat a sub-tree for it */
if( (item_length-req_path_size-2) != 0 )
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree( item_tree, tvb, offset+2+req_path_size, item_length-req_path_size-2,
ett_mb_cmd_data, NULL, "Command Specific Data" );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
/* Check what service code that received */
switch (service)
{
case SC_MB_READ_DISCRETE_INPUTS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_discrete_inputs_start_addr, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_discrete_inputs_num_inputs, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
break;
case SC_MB_READ_COILS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_coils_start_addr, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_coils_num_coils, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
break;
case SC_MB_READ_INPUT_REGISTERS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_input_register_start_addr, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_input_register_num_registers, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
break;
case SC_MB_READ_HOLDING_REGISTERS:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_holding_register_start_addr, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_read_holding_register_num_registers, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
break;
case SC_MB_WRITE_COILS:
{
guint16 NumCoils;
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_coils_start_addr, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN);
NumCoils = tvb_get_letohs( tvb, offset+2+req_path_size+2 );
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_coils_num_coils, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_coils_data, tvb, offset+2+req_path_size+4, (NumCoils+7)/8, ENC_NA);
}
break;
case SC_MB_WRITE_HOLDING_REGISTERS:
{
guint16 NumRegisters;
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_registers_start_addr, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN);
NumRegisters = tvb_get_letohs( tvb, offset+2+req_path_size+2 );
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_registers_num_registers, tvb, offset+2+req_path_size+2, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(cmd_data_tree, hf_cip_mb_write_registers_data, tvb, offset+2+req_path_size+4, NumRegisters*2, ENC_NA);
}
break;
case SC_MB_PASSTHROUGH:
/* Passthrough Request */
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
if( tvb_reported_length_remaining(tvb, offset) > 0 )
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
{
Major Re-factoring of the dissector and some new features. A change-list is as follows: - Removed un-necessary dissector revision updates from the file header since GIT tracks these nicely. - Added proper size detection of Modbus RTU messages (including exception responses), when dealing with partial TCP segment reassembly. - Moved the 'register' decode preferences to the Modbus dissector as TCP vs. RTU granularity isn't needed in this case. - Obsoleted un-unused 'address type format' user preferences - Cleaned up dissect_modbus_data to remove proto_tree_set_text instances. - For decoded register tree objects, use register 'address' instead of 'value' for the filter field to provide a more useful filter. - Added in conversation support, to attempt to track responses back to matching requests. - Use conversation support to attempt to populate proper register address offsets in the response messages. Currently each request is saved and each response looks for the last prior request that matches the function code. - Re-factored Modbus dissector to split apart request vs. response decoding. This has led to cleaner code paths, but some duplication where replies and requests are identical format. Change-Id: I0c86ae85b8ae4cc59b037e5f68f408833205fadd Reviewed-on: https://code.wireshark.org/review/9914 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>
2015-08-07 17:18:00 +00:00
int packet_type = QUERY_PACKET;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
/* dissect the Modbus PDU */
tvb_new_subset -> tvb_new_subset_length when length parameters are equal. 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-06-06 14:35:50 +00:00
next_tvb = tvb_new_subset_length( tvb, offset+2+req_path_size, item_length-req_path_size-2);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
Major Re-factoring of the dissector and some new features. A change-list is as follows: - Removed un-necessary dissector revision updates from the file header since GIT tracks these nicely. - Added proper size detection of Modbus RTU messages (including exception responses), when dealing with partial TCP segment reassembly. - Moved the 'register' decode preferences to the Modbus dissector as TCP vs. RTU granularity isn't needed in this case. - Obsoleted un-unused 'address type format' user preferences - Cleaned up dissect_modbus_data to remove proto_tree_set_text instances. - For decoded register tree objects, use register 'address' instead of 'value' for the filter field to provide a more useful filter. - Added in conversation support, to attempt to track responses back to matching requests. - Use conversation support to attempt to populate proper register address offsets in the response messages. Currently each request is saved and each response looks for the last prior request that matches the function code. - Re-factored Modbus dissector to split apart request vs. response decoding. This has led to cleaner code paths, but some duplication where replies and requests are identical format. Change-Id: I0c86ae85b8ae4cc59b037e5f68f408833205fadd Reviewed-on: https://code.wireshark.org/review/9914 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>
2015-08-07 17:18:00 +00:00
/* Call Modbus Dissector */
call_dissector_with_data(modbus_handle, next_tvb, pinfo, cmd_data_tree, &packet_type);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
}
break;
default:
proto_tree_add_item(cmd_data_tree, hf_cip_mb_data, tvb, offset+2+req_path_size, item_length-req_path_size-2, ENC_NA);
}
} /* End of if command-specific data present */
} /* End of if-else( request ) */
CIP: Attribute updates 1. Switched to common way to parse Get Attr All, using dissect_cip_get_attribute_all_rsp, for CCO (class version) and CIP Validator. This also fixed a missing attribute in the old CIP Validator code. 2. Add cip_string2 attribute implementation 3. For CIP Validator, set the protocol as "CIPS Validator", previously this was "CIPS Supervisor". 4. For classes with subdissectors, add the service to the Info column in the response. Change-Id: Id9593ca39497261075df8146cf63ee9581462e2a Reviewed-on: https://code.wireshark.org/review/14837 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-07 01:17:34 +00:00
add_cip_service_to_info_column(pinfo, service, cip_sc_vals_mb);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
} /* End of dissect_cip_mb_data() */
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_cip_class_mb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
{
proto_item *ti;
proto_tree *class_tree;
Fix: code under 'if(tree)' (in)directly calls sub-dissector/col_...()/expert...() fcns svn path=/trunk/; revision=43226
2012-06-12 21:22:46 +00:00
/* Create display subtree for the protocol */
ti = proto_tree_add_item(tree, proto_cip_class_mb, tvb, 0, -1, ENC_NA);
class_tree = proto_item_add_subtree( ti, ett_cip_class_mb );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
dissect_cip_mb_data( class_tree, tvb, 0, tvb_reported_length(tvb), pinfo );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/************************************************
*
* Dissector for CIP Connection Configuration Object
*
************************************************/
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang svn path=/trunk/; revision=40372
2012-01-04 17:34:36 +00:00
static int
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
dissect_cip_cco_all_attribute_common( proto_tree *cmd_tree, proto_item *ti,
tvbuff_t *tvb, int offset, int item_length, packet_info *pinfo)
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
proto_item *pi, *confgi;
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
proto_tree *tdi_tree, *iomap_tree, *epath_tree;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree *ncp_tree, *confg_tree;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
int conn_path_size, variable_data_size = 0, config_data_size;
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
int iomap_size, ot_rtf, to_rtf;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
int temp_data;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Connection flags */
temp_data = tvb_get_letohs( tvb, offset);
ot_rtf = (temp_data >> 1) & 7;
to_rtf = (temp_data >> 4) & 7;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
confgi = proto_tree_add_item(cmd_tree, hf_cip_cco_con_flags, tvb, offset, 2, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
confg_tree = proto_item_add_subtree(confgi, ett_cco_con_flag);
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
/* Add the data to the tree */
proto_tree_add_item(confg_tree, hf_cip_cco_con_type, tvb, offset, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(confg_tree, hf_cip_cco_ot_rtf, tvb, offset, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_item(confg_tree, hf_cip_cco_to_rtf, tvb, offset, 2, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Target device id */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
tdi_tree = proto_tree_add_subtree( cmd_tree, tvb, offset+2, 10, ett_cco_tdi, NULL, "Target Device ID");
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_deviceid(tvb, offset+2, tdi_tree,
hf_cip_cco_tdi_vendor, hf_cip_cco_tdi_devtype, hf_cip_cco_tdi_prodcode,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cco_tdi_compatibility, hf_cip_cco_tdi_comp_bit, hf_cip_cco_tdi_majorrev, hf_cip_cco_tdi_minorrev);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* CS Data Index Number */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_tree, hf_cip_cco_cs_data_index, tvb, offset+10, 4, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Net Connection Parameters */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
ncp_tree = proto_tree_add_subtree( cmd_tree, tvb, offset+14, 14, ett_cco_ncp, NULL, "Net Connection Parameters");
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
/* Timeout multiplier */
proto_tree_add_item(ncp_tree, hf_cip_cco_timeout_multiplier, tvb, offset+14, 1, ENC_LITTLE_ENDIAN );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
dissect_transport_type_trigger(tvb, offset+15, ncp_tree, hf_cip_cco_transport_type_trigger,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cco_fwo_dir, hf_cip_cco_fwo_trigger, hf_cip_cco_fwo_class, ett_cco_ttt);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
temp_data = tvb_get_letohl( tvb, offset+16);
proto_tree_add_uint_format_value(ncp_tree, hf_cip_cco_ot_rpi, tvb, offset+16, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
/* Display O->T network connection parameters */
dissect_net_param16(tvb, offset+20, ncp_tree,
hf_cip_cco_ot_net_param16, hf_cip_cco_fwo_own, hf_cip_cco_fwo_typ,
hf_cip_cco_fwo_prio, hf_cip_cco_fwo_fixed_var, hf_cip_cco_fwo_con_size, ett_cco_ncp);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
temp_data = tvb_get_letohl( tvb, offset+22);
proto_tree_add_uint_format_value(ncp_tree, hf_cip_cco_to_rpi, tvb, offset+16, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
/* Display T->O network connection parameters */
dissect_net_param16(tvb, offset+26, ncp_tree,
hf_cip_cco_to_net_param16, hf_cip_cco_fwo_own, hf_cip_cco_fwo_typ,
hf_cip_cco_fwo_prio, hf_cip_cco_fwo_fixed_var, hf_cip_cco_fwo_con_size, ett_cco_ncp);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Connection Path */
conn_path_size = tvb_get_guint8( tvb, offset+28 )*2;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_uint_format_value(cmd_tree, hf_cip_cco_conn_path_size, tvb, offset+28, 1, conn_path_size/2, "%d (words)", conn_path_size/2);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Display the Reserved byte */
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +00:00
proto_tree_add_item(cmd_tree, hf_cip_reserved8, tvb, offset+29, 1, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Add the epath */
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
epath_tree = proto_tree_add_subtree(cmd_tree, tvb, offset+30, conn_path_size, ett_path, &pi, "Connection Path: ");
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvb, pinfo, epath_tree, pi, offset+30, conn_path_size, FALSE, FALSE, NULL, NULL, NO_DISPLAY, NULL, FALSE);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size += (conn_path_size+30);
/* Config #1 Data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
config_data_size = tvb_get_letohs( tvb, offset+variable_data_size);
proto_tree_add_item(cmd_tree, hf_cip_cco_proxy_config_size, tvb, offset+variable_data_size, 2, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
if (config_data_size > 0)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_tree, hf_cip_cco_proxy_config_data, tvb, offset+variable_data_size+2, config_data_size, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size += (config_data_size+2);
/* Config #2 Data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
config_data_size = tvb_get_letohs( tvb, offset+variable_data_size);
proto_tree_add_item(cmd_tree, hf_cip_cco_target_config_size, tvb, offset+variable_data_size, 2, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
if (config_data_size > 0)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_tree, hf_cip_cco_target_config_data, tvb, offset+variable_data_size+2, config_data_size, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size += (config_data_size+2);
/* Connection Name */
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
variable_data_size += dissect_cip_string_type(pinfo, cmd_tree, ti, tvb, offset + variable_data_size, hf_cip_cco_connection_name, CIP_STRING2_TYPE);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* I/O Mapping */
iomap_size = tvb_get_letohs( tvb, offset+variable_data_size+2);
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
iomap_tree = proto_tree_add_subtree( cmd_tree, tvb, offset+variable_data_size, iomap_size+4, ett_cco_iomap, NULL, "I/O Mapping");
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
proto_tree_add_item(iomap_tree, hf_cip_cco_iomap_format_number, tvb, offset+variable_data_size, 2, ENC_LITTLE_ENDIAN );
proto_tree_add_uint_format_value(iomap_tree, hf_cip_cco_iomap_size, tvb, offset+variable_data_size+2, 2, iomap_size, "%d (bytes)", iomap_size);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
/* Attribute data */
if (iomap_size > 0)
proto_tree_add_item(iomap_tree, hf_cip_cco_iomap_attribute, tvb, offset+variable_data_size+4, iomap_size, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size += (iomap_size+4);
/* Proxy device id */
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
tdi_tree = proto_tree_add_subtree( cmd_tree, tvb, offset+variable_data_size, 8, ett_cco_pdi, NULL, "Proxy Device ID");
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_deviceid(tvb, offset+variable_data_size, tdi_tree,
hf_cip_cco_pdi_vendor, hf_cip_cco_pdi_devtype, hf_cip_cco_pdi_prodcode,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cco_pdi_compatibility, hf_cip_cco_pdi_comp_bit, hf_cip_cco_pdi_majorrev, hf_cip_cco_pdi_minorrev);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Add in proxy device id size */
variable_data_size += 8;
if ((offset+variable_data_size < item_length) &&
((ot_rtf == 5) || (to_rtf == 5)))
{
/* Safety parameters */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_tree, hf_cip_cco_safety, tvb, offset+variable_data_size, 55, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size += 55;
}
if (offset+variable_data_size < item_length)
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_tree, hf_cip_cco_connection_disable, tvb, offset+variable_data_size, 1, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size++;
}
if (offset+variable_data_size < item_length)
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_tree, hf_cip_cco_net_conn_param_attr, tvb, offset+variable_data_size, 1, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size++;
}
if (offset+variable_data_size < item_length)
{
/* Large Net Connection Parameter */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
ncp_tree = proto_tree_add_subtree( cmd_tree, tvb, offset+variable_data_size, 18, ett_cco_ncp, NULL, "Large Net Connection Parameters");
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(ncp_tree, hf_cip_cco_timeout_multiplier, tvb, offset+variable_data_size, 1, ENC_LITTLE_ENDIAN );
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_transport_type_trigger(tvb, offset+variable_data_size+1, ncp_tree, hf_cip_cco_transport_type_trigger,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cco_fwo_dir, hf_cip_cco_fwo_trigger, hf_cip_cco_fwo_class, ett_cco_ttt);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
temp_data = tvb_get_letohl( tvb, offset+variable_data_size+2);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_uint_format_value(ncp_tree, hf_cip_cco_ot_rpi, tvb, offset+variable_data_size+2, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Display O->T network connection parameters */
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_net_param32(tvb, offset+variable_data_size+6, ncp_tree,
hf_cip_cco_ot_net_param32, hf_cip_cco_lfwo_own, hf_cip_cco_lfwo_typ,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cco_lfwo_prio, hf_cip_cco_lfwo_fixed_var, hf_cip_cco_lfwo_con_size, ett_cco_ncp);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
temp_data = tvb_get_letohl( tvb, offset+variable_data_size+10);
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
proto_tree_add_uint_format_value(ncp_tree, hf_cip_cco_to_rpi, tvb, offset+variable_data_size+10, 4, temp_data, "%dms (0x%08X)", temp_data / 1000, temp_data);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Display T->O network connection parameters */
Fix a [-Wunused-but-set-variable] compiler warning; Also: Remove trailing whitespace from lines. svn path=/trunk/; revision=39623
2011-10-26 23:16:04 +00:00
dissect_net_param32(tvb, offset+variable_data_size+14, ncp_tree,
hf_cip_cco_to_net_param32, hf_cip_cco_lfwo_own, hf_cip_cco_lfwo_typ,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
hf_cip_cco_lfwo_prio, hf_cip_cco_lfwo_fixed_var, hf_cip_cco_lfwo_con_size, ett_cco_ncp);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
variable_data_size += 18;
}
CIP: Minor bug fixes 1. CIP: dissect_cip_set_attribute_list_req - Too many bytes highlighted. Could cause malformed packet 2. CIP: dissect_cip_cco_all_attribute_common - Too many bytes highlighted 3. CIP Motion: dissect_cntr_service - Wrong size passed in which tried to highlight too many bytes. Would cause malformed packet. 4. CIP: Some minor formatting/whitespace changes. Change-Id: I5899888a3e58452945c8546cf635768cdd3cf738 Reviewed-on: https://code.wireshark.org/review/18000 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>
2016-09-30 19:19:51 +00:00
return variable_data_size;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static void
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
dissect_cip_cco_data( proto_tree *item_tree, proto_item *ti, tvbuff_t *tvb, int offset, int item_length, packet_info *pinfo )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
proto_item *rrsc_item;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
proto_tree *rrsc_tree, *cmd_data_tree, *con_st_tree;
int req_path_size;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
guint8 service, gen_status, add_stat_size;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
cip_req_info_t* preq_info;
cip_simple_request_info_t req_data;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29341
2009-08-09 06:47:24 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP CCO");
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add Service code & Request/Response tree */
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
service = tvb_get_guint8( tvb, offset );
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
rrsc_tree = proto_tree_add_subtree( item_tree, tvb, offset, 1, ett_cco_rrsc, &rrsc_item, "Service: " );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add Request/Response */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( rrsc_tree, hf_cip_reqrsp, tvb, offset, 1, ENC_LITTLE_ENDIAN );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
proto_item_append_text( rrsc_item, "%s (%s)",
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
val_to_str( ( service & CIP_SC_MASK ),
From Joakim Wiberg via bug 3670: This patch correctes serveral minor things. 1. Adds decoding of generic services to classes that have a separate dissect function. 2. Adds new error codes. 3. Adds new CIP objects. 4. Extends the VendorID list. svn path=/trunk/; revision=28951
2009-07-06 13:59:09 +00:00
cip_sc_vals_cco , "Unknown Service (0x%02x)"),
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
val_to_str_const( ( service & CIP_SC_RESPONSE_MASK )>>7,
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
cip_sc_rr, "") );
/* Add Service code */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(rrsc_tree, hf_cip_cco_sc, tvb, offset, 1, ENC_LITTLE_ENDIAN );
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
preq_info = (cip_req_info_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ((preq_info != NULL) &&
(preq_info->ciaData != NULL))
From Michael Mann : General improvements to CIP and ENIP dissectors. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
memcpy(&req_data, preq_info->ciaData, sizeof(cip_simple_request_info_t));
}
else
{
req_data.iClass = (guint32)-1;
req_data.iInstance = (guint32)-1;
req_data.iAttribute = (guint32)-1;
req_data.iMember = (guint32)-1;
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if(service & CIP_SC_RESPONSE_MASK )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
/* Response message */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add additional status size */
gen_status = tvb_get_guint8( tvb, offset+2 );
add_stat_size = tvb_get_guint8( tvb, offset+3 ) * 2;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* If there is any command specific data create a sub-tree for it */
if( ( item_length-4-add_stat_size ) != 0 )
{
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree( item_tree, tvb, offset+4+add_stat_size, item_length-4-add_stat_size,
ett_cco_cmd_data, NULL, "Command Specific Data" );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if( gen_status == CI_GRC_SUCCESS || gen_status == CI_GRC_SERVICE_ERROR )
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Success responses */
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if (((service & CIP_SC_MASK) == SC_GET_ATT_ALL) &&
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
(req_data.iInstance != (guint32)-1))
{
if (req_data.iInstance == 0)
{
/* Get Attribute All (class) request */
CIP: Attribute updates 1. Switched to common way to parse Get Attr All, using dissect_cip_get_attribute_all_rsp, for CCO (class version) and CIP Validator. This also fixed a missing attribute in the old CIP Validator code. 2. Add cip_string2 attribute implementation 3. For CIP Validator, set the protocol as "CIPS Validator", previously this was "CIPS Supervisor". 4. For classes with subdissectors, add the service to the Info column in the response. Change-Id: Id9593ca39497261075df8146cf63ee9581462e2a Reviewed-on: https://code.wireshark.org/review/14837 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-07 01:17:34 +00:00
dissect_cip_get_attribute_all_rsp(tvb, pinfo, cmd_data_tree, offset + 4 + add_stat_size, &req_data);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
else
{
/* Get Attribute All (instance) request */
/* Connection status */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
con_st_tree = proto_tree_add_subtree( cmd_data_tree, tvb, offset+4+add_stat_size, 4, ett_cco_con_status, NULL, "Connection Status");
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(con_st_tree, hf_cip_genstat, tvb, offset+4+add_stat_size, 1, ENC_LITTLE_ENDIAN );
proto_tree_add_item(con_st_tree, hf_cip_pad8, tvb, offset+4+add_stat_size+1, 1, ENC_LITTLE_ENDIAN);
Back out improvements - it's still getting a lot of "used uninitialized" errors, so I'll reopen the bug and log all the warnings that have been produced, and mark the patch as "rejected". svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Extended Status */
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
proto_tree_add_item(con_st_tree, hf_cip_cco_ext_status, tvb, offset+4+add_stat_size+2, 2, ENC_LITTLE_ENDIAN);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
dissect_cip_cco_all_attribute_common(cmd_data_tree, ti, tvb, offset+4+add_stat_size+4, item_length, pinfo);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
}
else
{
/* Add data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
else
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Error responses */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+4+add_stat_size, item_length-4-add_stat_size, ENC_NA);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
} /* end of if-else( CI_CRC_SUCCESS ) */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
} /* End of if command-specific data present */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
} /* End of if reply */
else
{
/* Request message */
req_path_size = tvb_get_guint8( tvb, offset+1 )*2;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* If there is any command specific data create a sub-tree for it */
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if( (item_length-req_path_size-2) != 0 )
{
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
cmd_data_tree = proto_tree_add_subtree( item_tree, tvb, offset+2+req_path_size, item_length-req_path_size-2,
ett_cco_cmd_data, NULL, "Command Specific Data" );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
/* Check what service code that received */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
switch (service)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
case SC_CCO_AUDIT_CHANGE:
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_cco_change_type, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
case SC_CCO_CHANGE_COMPLETE:
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_cco_change_type, tvb, offset+2+req_path_size, 2, ENC_LITTLE_ENDIAN );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
case SC_SET_ATT_ALL:
if ((req_data.iInstance == 0) ||
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
(req_data.iInstance == (guint32)-1))
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
{
/* Just add raw data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+2+req_path_size, item_length-req_path_size-2, ENC_NA);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
}
/* Set Attribute All (instance) request */
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
dissect_cip_cco_all_attribute_common(cmd_data_tree, ti, tvb, offset+2+req_path_size, item_length, pinfo);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
break;
default:
From Ryan Wamsley: Add Connection Configuration Object support to EtherNet/IP dissector svn path=/trunk/; revision=20897
2007-02-22 03:21:26 +00:00
#include <prefs.h> not req'd; Fix indentation to be conistent svn path=/trunk/; revision=26086
2008-08-25 20:41:05 +00:00
/* Add data */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, offset+2+req_path_size, item_length-req_path_size-2, ENC_NA);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
} /* End of check service code */
} /* End of if command-specific data present */
#include <prefs.h> not req'd; Fix indentation to be conistent svn path=/trunk/; revision=26086
2008-08-25 20:41:05 +00:00
} /* End of if-else( request ) */
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
CIP: Attribute updates 1. Switched to common way to parse Get Attr All, using dissect_cip_get_attribute_all_rsp, for CCO (class version) and CIP Validator. This also fixed a missing attribute in the old CIP Validator code. 2. Add cip_string2 attribute implementation 3. For CIP Validator, set the protocol as "CIPS Validator", previously this was "CIPS Supervisor". 4. For classes with subdissectors, add the service to the Info column in the response. Change-Id: Id9593ca39497261075df8146cf63ee9581462e2a Reviewed-on: https://code.wireshark.org/review/14837 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-04-07 01:17:34 +00:00
add_cip_service_to_info_column(pinfo, service, cip_sc_vals_cco);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
} /* End of dissect_cip_cco_data() */
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_cip_class_cco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
proto_item *ti;
proto_tree *class_tree;
Fix: code under 'if(tree)' (in)directly calls sub-dissector/col_...()/expert...() fcns svn path=/trunk/; revision=43226
2012-06-12 21:22:46 +00:00
/* Create display subtree for the protocol */
ti = proto_tree_add_item(tree, proto_cip_class_cco, tvb, 0, -1, ENC_NA);
class_tree = proto_item_add_subtree( ti, ett_cip_class_cco );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
dissect_cip_cco_data( class_tree, ti, tvb, 0, tvb_reported_length(tvb), pinfo );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
static gboolean
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_class_cco_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
unsigned char service, service_code, ioilen, segment;
cip_req_info_t* preq_info;
guint32 classid = 0;
int offset = 0;
service = tvb_get_guint8( tvb, offset );
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
service_code = service & CIP_SC_MASK;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Handle GetAttributeAll and SetAttributeAll in CCO class */
if ((service_code == SC_GET_ATT_ALL) ||
(service_code == SC_SET_ATT_ALL))
{
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if (service & CIP_SC_RESPONSE_MASK)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
/* Service response */
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
preq_info = (cip_req_info_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ((preq_info != NULL) &&
(preq_info->dissector == dissector_get_uint_handle( subdissector_class_table, CI_CLS_CCO)))
{
call_dissector(preq_info->dissector, tvb, pinfo, tree);
return TRUE;
}
}
else
{
/* Service request */
ioilen = tvb_get_guint8( tvb, offset + 1 );
if (ioilen > 1)
{
segment = tvb_get_guint8( tvb, offset + 2 );
if (((segment & CI_SEGMENT_TYPE_MASK) == CI_LOGICAL_SEGMENT) &&
((segment & CI_LOGICAL_SEG_TYPE_MASK) == CI_LOGICAL_SEG_CLASS_ID))
{
/* Logical Class ID, do a format check */
switch ( segment & CI_LOGICAL_SEG_FORMAT_MASK )
{
case CI_LOGICAL_SEG_8_BIT:
classid = tvb_get_guint8( tvb, offset + 3 );
break;
case CI_LOGICAL_SEG_16_BIT:
if ( ioilen >= 2 )
classid = tvb_get_letohs( tvb, offset + 4 );
break;
case CI_LOGICAL_SEG_32_BIT:
if ( ioilen >= 3 )
classid = tvb_get_letohl( tvb, offset + 4 );
break;
}
}
}
if (classid == CI_CLS_CCO)
{
call_dissector(cip_class_cco_handle, tvb, pinfo, tree );
return TRUE;
}
}
}
return FALSE;
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/************************************************
*
* Dissector for CIP Request/Response
* - matches requests/responses
* - calls class specific dissector
*
************************************************/
static void
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_cip_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, packet_info *pinfo, cip_req_info_t* preq_info, proto_item* msp_item, gboolean is_msp_item )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
proto_item *ti;
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
proto_tree *cip_tree, *epath_tree;
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
proto_item *pi, *rrsc_item, *status_item;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree *rrsc_tree, *status_tree, *add_status_tree;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
int req_path_size;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
unsigned char i, gen_status, add_stat_size;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
unsigned char service,ioilen,segment;
void *p_save_proto_data;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
cip_simple_request_info_t path_info;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
dissector_handle_t dissector;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
gint service_index;
Change the signature of dissector_try_heuristic() to return hdtbl_entry 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-20 10:54:20 +00:00
heur_dtbl_entry_t *hdtbl_entry;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
p_save_proto_data = p_get_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
p_remove_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
p_add_proto_data(wmem_file_scope(), pinfo, proto_cip, 0, preq_info);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Create display subtree for the protocol */
For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg. Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
ti = proto_tree_add_item(item_tree, proto_cip, tvb, 0, -1, ENC_NA);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
cip_tree = proto_item_add_subtree( ti, ett_cip );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
service = tvb_get_guint8( tvb, offset );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Add Service code & Request/Response tree */
Whitespace cleanup. svn path=/trunk/; revision=41386
2012-03-06 22:29:42 +00:00
rrsc_item = proto_tree_add_uint_format_value(cip_tree, hf_cip_service,
tvb, offset, 1, service, "%s (%s)",
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
val_to_str( ( service & CIP_SC_MASK ), cip_sc_vals , "Unknown Service (0x%02x)"),
val_to_str_const( ( service & CIP_SC_RESPONSE_MASK )>>7, cip_sc_rr, ""));
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
rrsc_tree = proto_item_add_subtree( rrsc_item, ett_rrsc );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_tree_add_item( rrsc_tree, hf_cip_reqrsp, tvb, offset, 1, ENC_LITTLE_ENDIAN);
proto_tree_add_item(rrsc_tree, hf_cip_service_code, tvb, offset, 1, ENC_LITTLE_ENDIAN);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
if( service & CIP_SC_RESPONSE_MASK )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
/* Response message */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
status_tree = proto_tree_add_subtree( cip_tree, tvb, offset+2, 1, ett_status_item, &status_item, "Status: " );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add general status */
gen_status = tvb_get_guint8( tvb, offset+2 );
Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +00:00
proto_tree_add_item(status_tree, hf_cip_genstat, tvb, offset+2, 1, ENC_LITTLE_ENDIAN );
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
proto_item_append_text( status_item, "%s: ", val_to_str_ext( gen_status,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&cip_gs_vals_ext , "Unknown Response (%x)") );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
CIP: Cleanup info column for MSP packets 1. Skip printing class name in info column when it was an MSP, since it's implied. 2. Don't print response status for embedded messages in info column for MSP. It makes the line too long. 3. Print the response status for embedded messages in the Service Packet tree. This makes it easier to find the packet that may have failed. Change-Id: I2c60fb9baf113a215ada7301f493cbd51e340dcd Reviewed-on: https://code.wireshark.org/review/16162 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-06-27 02:34:03 +00:00
if (is_msp_item == FALSE)
{
/* Add reply status to info column */
col_append_fstr(pinfo->cinfo, COL_INFO, "%s: ",
val_to_str_ext(gen_status, &cip_gs_vals_ext, "Unknown Response (%x)"));
}
else
{
proto_item_append_text(msp_item, "%s: ",
val_to_str_ext(gen_status, &cip_gs_vals_ext, "Unknown Response (%x)"));
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add additional status size */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
add_stat_size = tvb_get_guint8( tvb, offset+3 );
proto_tree_add_uint_format_value(status_tree, hf_cip_addstat_size,
tvb, offset+3, 1, add_stat_size, "%d (words)", add_stat_size);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if( add_stat_size )
{
/* Add additional status */
convert to proto_tree_add_subtree[_format] Change-Id: I5f573dffabb8685a8e5a334ff2bfb24d9838daa6 Reviewed-on: https://code.wireshark.org/review/2601 Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-24 00:39:28 +00:00
add_status_tree = proto_tree_add_subtree( status_tree, tvb, offset+4, add_stat_size*2, ett_add_status_item, NULL, "Additional Status" );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
for( i=0; i < add_stat_size; i ++ )
proto_tree_add_item(add_status_tree, hf_cip_add_stat, tvb, offset+4+(i*2), 2, ENC_LITTLE_ENDIAN );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
proto_item_set_len( status_item, 2 + add_stat_size*2);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
/* The previous packet service must be Unconnected Send, or match the current
service to be a valid match. If they don't, ignore the previous data.*/
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if( preq_info
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
&& !( preq_info->bService == ( service & CIP_SC_MASK )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
|| ( preq_info->bService == SC_CM_UNCON_SEND && preq_info->dissector == cip_class_cm_handle )
)
)
preq_info = NULL;
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions Bug: 12676 Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a Reviewed-on: https://code.wireshark.org/review/16748 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-28 12:44:11 +00:00
display_previous_request_path(preq_info, cip_tree, tvb, pinfo, msp_item, is_msp_item);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Check to see if service is 'generic' */
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
try_val_to_str_idx((service & CIP_SC_MASK), cip_sc_vals, &service_index);
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
/* If the request set a dissector, then check that first. This ensures
that Unconnected Send responses are properly parsed based on the
embedded request. */
if (preq_info && preq_info->dissector)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
call_dissector(preq_info->dissector, tvb, pinfo, item_tree);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
else if (service_index >= 0)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
/* See if object dissector wants to override generic service handling */
if(!dissector_try_heuristic(heur_subdissector_service, tvb, pinfo, item_tree, &hdtbl_entry, NULL))
{
dissect_cip_generic_service_rsp(tvb, pinfo, cip_tree);
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
else
{
call_dissector( cip_class_generic_handle, tvb, pinfo, item_tree );
}
} /* End of if reply */
else
{
/* Request message */
/* Add path size to tree */
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
req_path_size = tvb_get_guint8( tvb, offset+1);
proto_tree_add_uint_format_value(cip_tree, hf_cip_request_path_size,
tvb, offset+1, 1, req_path_size, "%d (words)", req_path_size);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Add the epath */
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
epath_tree = proto_tree_add_subtree(cip_tree, tvb, offset+2, req_path_size*2, ett_path, &pi, "Request Path: ");
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (preq_info)
{
Convert a few more dissectors to wmem svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
preq_info->ciaData = wmem_new(wmem_file_scope(), cip_simple_request_info_t);
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvb, pinfo, epath_tree, pi, offset+2, req_path_size*2, FALSE, FALSE, preq_info->ciaData, NULL, DISPLAY_REQUEST_PATH, msp_item, is_msp_item);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
memcpy(&path_info, preq_info->ciaData, sizeof(cip_simple_request_info_t));
}
else
{
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_epath(tvb, pinfo, epath_tree, pi, offset+2, req_path_size*2, FALSE, FALSE, &path_info, NULL, DISPLAY_REQUEST_PATH, msp_item, is_msp_item);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
ioilen = tvb_get_guint8( tvb, offset + 1 );
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if ( preq_info )
preq_info->dissector = NULL;
dissector = NULL;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
it's ==> its & its ==> it's as needed. svn path=/trunk/; revision=47891
2013-02-26 01:06:19 +00:00
/* The class ID should already be extracted if it's available */
Try to fix cc1: warnings being treated as errors packet-cip.c: In function 'dissect_cip_generic_service_req': packet-cip.c:3281: warning: format not a string literal and no format arguments packet-cip.c: In function 'dissect_cip_generic_service_rsp': packet-cip.c:3631: warning: format not a string literal and no format arguments packet-cip.c: In function 'dissect_cip_data': packet-cip.c:4881: warning: comparison between signed and unsigned svn path=/trunk/; revision=39599
2011-10-26 06:14:53 +00:00
if (path_info.iClass != 0xFFFFFFFF)
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
dissector = dissector_get_uint_handle( subdissector_class_table, path_info.iClass);
}
else
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( ioilen >= 1 )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
segment = tvb_get_guint8( tvb, offset + 2 );
if ((segment & CI_SEGMENT_TYPE_MASK) == CI_DATA_SEGMENT)
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
dissector = dissector_get_uint_handle( subdissector_symbol_table, segment );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
}
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if ( preq_info )
{
preq_info->dissector = dissector;
/* copy IOI for access by response packet */
Convert a few more dissectors to wmem svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
preq_info->pIOI = wmem_alloc(wmem_file_scope(), ioilen*2);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
preq_info->IOILen = ioilen;
tvb_memcpy(tvb, preq_info->pIOI, offset+2, ioilen*2);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
preq_info->bService = service;
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Check to see if service is 'generic' */
Rename value string (and similar) functions to use a consistent pattern. This 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-29 00:26:23 +00:00
try_val_to_str_idx(service, cip_sc_vals, &service_index);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
if (service_index >= 0)
{
/* See if object dissector wants to override generic service handling */
Change the signature of dissector_try_heuristic() to return hdtbl_entry 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-20 10:54:20 +00:00
if(!dissector_try_heuristic(heur_subdissector_service, tvb, pinfo, item_tree, &hdtbl_entry, NULL))
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{
Bugfixes for EtherNet/IP and CIP EtherNet/IP 1. Only decode 32-bit header if there is enough data. Previously, this would show malformed data, even for I/O packets that have no data, eg: heartbeat data. 2. Typos CIP 1. Many Time Sync attribute responses were flagged incorrectly as malformed. 2. Create service response highlighted the instance number incorrectly, and showed warnings. 3. Set Attribute List Request should exit early if it doesn't know about a particular attribute. 4. Incorrect format for Safety Network Segment: Router Format. 5. Typos Change-Id: I506dbb053c247bc8efcbde2cce6ab24d9550c897 Reviewed-on: https://code.wireshark.org/review/12321 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>
2015-11-30 18:10:19 +00:00
/* No need to set a custom dissector if this is just a generic service. */
if (preq_info)
{
preq_info->dissector = NULL;
}
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
dissect_cip_generic_service_req(tvb, pinfo, cip_tree, &path_info);
}
}
else if ( dissector )
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
{
call_dissector( dissector, tvb, pinfo, item_tree );
}
else
{
call_dissector( cip_class_generic_handle, tvb, pinfo, item_tree );
}
} /* End of if-else( request ) */
Create the ability to have packet scoped "proto" data. Bug 9470 (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-23 02:20:13 +00:00
p_remove_proto_data(wmem_file_scope(), pinfo, proto_cip, 0);
p_add_proto_data(wmem_file_scope(), pinfo, proto_cip, 0, p_save_proto_data);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
} /* End of dissect_cip_data() */
static int
Initial commit to support yet another method of passing data between dissectors. Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
dissect_cip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
{
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
enip_request_info_t *enip_info;
cip_req_info_t *preq_info;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Make entries in Protocol column and Info column on summary display */
Don't guard col_set_str (COL_PROTOCOL) with col_check svn path=/trunk/; revision=29341
2009-08-09 06:47:24 +00:00
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP");
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
Don't guard col_clear with col_check svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
col_clear(pinfo->cinfo, COL_INFO);
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
col_append_sep_str(pinfo->cinfo, COL_INFO, " | ", "");
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Each CIP request received by ENIP gets a unique ID */
Add EtherNet/IP connection conversation filters Change-Id: Ia69cbe9fea364c735bde956d84a82404b46ec236 Reviewed-on: https://code.wireshark.org/review/1810 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-27 02:58:48 +00:00
enip_info = (enip_request_info_t*)p_get_proto_data(wmem_file_scope(), pinfo, proto_enip, ENIP_REQUEST_INFO);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if ( enip_info )
Moved setting of length2 to make it always set. svn path=/trunk/; revision=28777
2009-06-19 05:45:40 +00:00
{
From Michael Mann: ENIP dissector - improved I/O connection dissection through "better conversation" https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6617 svn path=/trunk/; revision=40059
2011-12-01 06:05:39 +00:00
preq_info = enip_info->cip_info;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
if ( preq_info == NULL )
{
Convert a few more dissectors to wmem svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
preq_info = wmem_new0(wmem_file_scope(), cip_req_info_t);
From Didier Gautheron via bug 4419: se_alloc and ep_alloc never return NULL and se_alloc0 already initialized data with 0. svn path=/trunk/; revision=31654
2010-01-25 11:47:39 +00:00
enip_info->cip_info = preq_info;
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_cip_data( tree, tvb, 0, pinfo, enip_info->cip_info, NULL, FALSE );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
}
else
{
CIP: Restore path information to Info column When the "Display enhanced Info column data" preference is set, ensure that: 1. For non-MSP packets, path information (class/symbol) is displayed in the Info column for Forward Open, Forward Close, regular Message Router Request/Response messages 2. For MSP packets, don't display the class/symbol in the Info column (it's too wordy) This now relies on an extra boolean passed to dissect_cip_data() to handle #2 above. Previously, this relied on checking a proto_item* for NULL, which is not correct. Change-Id: I7532660bcb23bd664c1f5532256755922c4937d1 Reviewed-on: https://code.wireshark.org/review/14458 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-14 03:47:38 +00:00
dissect_cip_data( tree, tvb, 0, pinfo, NULL, NULL, FALSE );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
}
Revert changes committed by an accident. Will be committed again later. svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:31:57 +00:00
return tvb_reported_length(tvb);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
}
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
static int
dissect_cip_implicit(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
proto_item *ti;
proto_item *conn_path_class_item;
proto_tree *cip_tree;
proto_tree *cmd_data_tree;
guint32 ClassID = GPOINTER_TO_UINT(data);
int length = tvb_reported_length_remaining(tvb, 0);
/* Make entries in Protocol column and Info column on summary display */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP");
col_clear(pinfo->cinfo, COL_INFO);
/* Create display subtree for the protocol */
ti = proto_tree_add_item(tree, proto_cip, tvb, 0, length, ENC_NA);
cip_tree = proto_item_add_subtree(ti, ett_cip);
/* Display Class ID from the Forward Open Connection Path. */
conn_path_class_item = proto_tree_add_uint(cip_tree, hf_conn_path_class, NULL, 0, 0, ClassID);
PROTO_ITEM_SET_GENERATED(conn_path_class_item);
cmd_data_tree = proto_tree_add_subtree(cip_tree, tvb, 0, length,
ett_cmd_data, NULL, "Command Specific Data");
proto_tree_add_item(cmd_data_tree, hf_cip_data, tvb, 0, length, ENC_NA);
col_append_fstr(pinfo->cinfo, COL_INFO, "Implicit Data - %s",
val_to_str(ClassID, cip_class_names_vals, "Class (0x%02x)"));
return tvb_reported_length(tvb);
}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/*
* Protocol initialization
*/
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
void
proto_register_cip(void)
{
/* Setup list of header fields */
#include <prefs.h> not req'd; Fix indentation to be conistent svn path=/trunk/; revision=26086
2008-08-25 20:41:05 +00:00
static hf_register_info hf[] = {
CIP: Add support for common class attributes Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2 Reviewed-on: https://code.wireshark.org/review/12502 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>
2015-12-10 16:39:46 +00:00
{ &hf_attr_class_revision, { "Revision", "cip.class_revision", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_max_instance, { "Max Instance", "cip.max_instance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_num_instance, { "Number of Instances", "cip.num_instance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_opt_attr_num, { "Number of Attributes", "cip.num_attr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_attr_num, { "Attribute Number", "cip.attr_num", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_opt_service_num, { "Number of Services", "cip.num_service", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_service_code, { "Service Code", "cip.service_code", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_num_class_attr, { "Maximum ID Number Class Attributes", "cip.num_class_attr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_attr_class_num_inst_attr, { "Maximum ID Number Instance Attributes", "cip.num_inst_attr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_service, { "Service", "cip.service", FT_UINT8, BASE_HEX, NULL, 0, "Service Code + Request/Response", HFILL }},
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
{ &hf_cip_reqrsp, { "Request/Response", "cip.rr", FT_UINT8, BASE_HEX, VALS(cip_sc_rr), CIP_SC_RESPONSE_MASK, "Request or Response message", HFILL }},
{ &hf_cip_service_code, { "Service", "cip.sc", FT_UINT8, BASE_HEX, VALS(cip_sc_vals), CIP_SC_MASK, "Service Code", HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_epath, { "EPath", "cip.epath", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_genstat, { "General Status", "cip.genstat", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &cip_gs_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_addstat_size, { "Additional Status Size", "cip.addstat_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_add_stat, { "Additional Status", "cip.addstat", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_request_path_size, { "Request Path Size", "cip.request_path_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_path_segment, { "Path Segment", "cip.path_segment", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_path_segment_type, { "Path Segment Type", "cip.path_segment.type", FT_UINT8, BASE_DEC, VALS(cip_path_seg_vals), CI_SEGMENT_TYPE_MASK, NULL, HFILL }},
Fix incorrect packet-details display of a 1 bit FT_BOOLEAN field. svn path=/trunk/; revision=41378
2012-03-06 20:11:43 +00:00
{ &hf_cip_port_ex_link_addr, { "Extended Link Address", "cip.ex_linkaddress", FT_BOOLEAN, 8, TFS(&tfs_true_false), CI_PORT_SEG_EX_LINK_ADDRESS, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_port, { "Port", "cip.port", FT_UINT8, BASE_DEC, NULL, CI_PORT_SEG_PORT_ID_MASK, "Port Identifier", HFILL }},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ &hf_cip_port_extended,{ "Port Extended", "cip.port", FT_UINT16, BASE_HEX, NULL, 0, "Port Identifier Extended", HFILL } },
Fix some hf_ field datatype conflicts. 'ieee17221.clock_source_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'ieee17221.stream_format' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'afp.unknown' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES 'afp.toc_offset' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'bootp.client_id.iaid' exists multiple times with NOT compatible types: FT_UINT32 and FT_STRING 'bthfp.chld.mode' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'canopen.pdo.data' exists multiple times with NOT compatible types: FT_STRINGZ and FT_BYTES 'canopen.sdo.data' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES 'ceph.msg.' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'ceph.version' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'cip.linkaddress' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'dnp3.al.ana' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dnp3.al.anaout' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dtls.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'ssl.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'dvb-s2_gse.label' exists multiple times with NOT compatible types: FT_UINT24 and FT_ETHER 'fcdns.rply.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'fcdns.req.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'icmp.int_info.name' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'mausb.clear_transfers.status' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mikey.v' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mswsp.rangeboundry.ultype' exists multiple times with NOT compatible types: FT_STRING and FT_UINT32 'mswsp.arrayvector.address64' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_offset' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_len' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'pflog.saddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.daddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.saddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pflog.daddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pgm.spm.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.src' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.grp' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.poll.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.redirect.dlr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: Iaf694699d108a12db172da8dd9fbab211adb329d Reviewed-on: https://code.wireshark.org/review/14070 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-22 01:19:02 +00:00
{ &hf_cip_link_address_byte, { "Link Address", "cip.linkaddress.byte", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_link_address_size, { "Link Address Size", "cip.linkaddress_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
Fix some hf_ field datatype conflicts. 'ieee17221.clock_source_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'ieee17221.stream_format' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'afp.unknown' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES 'afp.toc_offset' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64 'bootp.client_id.iaid' exists multiple times with NOT compatible types: FT_UINT32 and FT_STRING 'bthfp.chld.mode' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'canopen.pdo.data' exists multiple times with NOT compatible types: FT_STRINGZ and FT_BYTES 'canopen.sdo.data' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES 'ceph.msg.' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'ceph.version' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64 'cip.linkaddress' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8 'dnp3.al.ana' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dnp3.al.anaout' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32 'dtls.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'ssl.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16 'dvb-s2_gse.label' exists multiple times with NOT compatible types: FT_UINT24 and FT_ETHER 'fcdns.rply.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'fcdns.req.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8 'icmp.int_info.name' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8 'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'mausb.clear_transfers.status' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mikey.v' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE 'mswsp.rangeboundry.ultype' exists multiple times with NOT compatible types: FT_STRING and FT_UINT32 'mswsp.arrayvector.address64' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_offset' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'nlm.lock.l_len' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64 'pflog.saddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.daddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pflog.saddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pflog.daddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6 'pgm.spm.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.src' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.nak.grp' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.poll.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6 'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 'pgm.opts.redirect.dlr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4 Change-Id: Iaf694699d108a12db172da8dd9fbab211adb329d Reviewed-on: https://code.wireshark.org/review/14070 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-22 01:19:02 +00:00
{ &hf_cip_link_address_string, { "Link Address", "cip.linkaddress.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_logical_seg_type, { "Logical Segment Type", "cip.logical_segment.type", FT_UINT8, BASE_DEC, VALS(cip_logical_segment_type_vals), CI_LOGICAL_SEG_TYPE_MASK, NULL, HFILL }},
{ &hf_cip_logical_seg_format, { "Logical Segment Format", "cip.logical_segment.format", FT_UINT8, BASE_DEC, VALS(cip_logical_segment_format_vals), CI_LOGICAL_SEG_FORMAT_MASK, NULL, HFILL }},
{ &hf_cip_class8, { "Class", "cip.class", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &cip_class_names_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_class16, { "Class", "cip.class", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_class_names_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_class32, { "Class", "cip.class", FT_UINT32, BASE_HEX|BASE_EXT_STRING, &cip_class_names_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_instance8, { "Instance", "cip.instance", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_instance16, { "Instance", "cip.instance", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_instance32, { "Instance", "cip.instance", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_member8, { "Member", "cip.member", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_member16, { "Member", "cip.member", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_member32, { "Member", "cip.member", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{ &hf_cip_attribute8, { "Attribute", "cip.attribute", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_attribute16, { "Attribute", "cip.attribute", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_attribute32, { "Attribute", "cip.attribute", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_conpoint8, { "Connection Point", "cip.connpoint", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_conpoint16, { "Connection Point", "cip.connpoint", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_conpoint32, { "Connection Point", "cip.connpoint", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ &hf_cip_serviceid8,{ "Service ID", "cip.serviceid", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_ekey_format, { "Key Format", "cip.ekey.format", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_ekey_vendor, { "Vendor ID", "cip.ekey.vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_ekey_devtype, { "Device Type", "cip.ekey.devtype", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &cip_devtype_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_ekey_prodcode, { "Product Code", "cip.ekey.product_code", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_ekey_compatibility, { "Compatibility", "cip.ekey.compatibility", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_ekey_comp_bit, { "Compatibility", "cip.ekey.comp_bit", FT_UINT8, BASE_HEX, VALS(cip_com_bit_vals), 0x80, "EKey: Compatibility bit", HFILL }},
{ &hf_cip_ekey_majorrev, { "Major Revision", "cip.ekey.major_rev", FT_UINT8, BASE_DEC, NULL, 0x7F, "EKey: Major Revision", HFILL }},
{ &hf_cip_ekey_minorrev, { "Minor Revision", "cip.ekey.minor_rev", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ &hf_cip_ext_logical8,{ "Extended Logical", "cip.extlogical", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_cip_ext_logical16,{ "Extended Logical", "cip.extlogical", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_cip_ext_logical32,{ "Extended Logical", "cip.extlogical", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_cip_ext_logical_type,{ "Extended Logical Type", "cip.extlogical.type", FT_UINT8, BASE_HEX, VALS(cip_ext_logical_segment_format_vals), 0, NULL, HFILL } },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_data_seg_type, { "Data Segment Type", "cip.data_segment.type", FT_UINT8, BASE_DEC, VALS(cip_data_segment_type_vals), CI_DATA_SEG_TYPE_MASK, NULL, HFILL }},
{ &hf_cip_data_seg_size, { "Data Size", "cip.data_segment.size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{ &hf_cip_data_seg_item, { "Data", "cip.data_segment.data", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ &hf_cip_symbol, { "ANSI Symbol", "cip.symbol", FT_STRING, BASE_NONE, NULL, 0, "ANSI Extended Symbol Segment", HFILL }},
{ &hf_cip_symbol_size, { "Symbolic Symbol Size", "cip.symbol.size", FT_UINT8, BASE_DEC, NULL, 0x1F, NULL, HFILL } },
{ &hf_cip_symbol_ascii, { "ASCII Symbol", "cip.ascii_symbol", FT_STRING, BASE_NONE, NULL, 0, "ASCII Symbol Segment", HFILL } },
{ &hf_cip_symbol_extended_format,{ "Extended String Format", "cip.symbol.format", FT_UINT8, BASE_DEC, VALS(cip_symbolic_format_vals), CI_SYMBOL_SEG_FORMAT_MASK, NULL, HFILL } },
{ &hf_cip_symbol_numeric_format,{ "Extended String Numeric Format", "cip.symbol.numformat", FT_UINT8, BASE_DEC, VALS(cip_symbolic_numeric_format_vals), 0x1F, NULL, HFILL } },
{ &hf_cip_symbol_double_size, { "Double Byte Chars", "cip.symbol.size", FT_UINT8, BASE_DEC, NULL, 0x1F, NULL, HFILL } },
{ &hf_cip_symbol_triple_size, { "Triple Byte Chars", "cip.symbol.size", FT_UINT8, BASE_DEC, NULL, 0x1F, NULL, HFILL } },
{ &hf_cip_numeric_usint,{ "Numeric Symbol", "cip.numeric_symbol", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_cip_numeric_uint,{ "Numeric Symbol", "cip.numeric_symbol", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_cip_numeric_udint,{ "Numeric Symbol", "cip.numeric_symbol", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_network_seg_type, { "Network Segment Type", "cip.network_segment.type", FT_UINT8, BASE_DEC, VALS(cip_network_segment_type_vals), CI_NETWORK_SEG_TYPE_MASK, NULL, HFILL }},
{ &hf_cip_seg_schedule, { "Multiplier/Phase", "cip.network_segment.schedule", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_fixed_tag, { "Fixed Tag", "cip.network_segment.fixed_tag", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ &hf_cip_seg_prod_inhibit_time, { "Production Inhibit Time (ms)", "cip.network_segment.prod_inhibit", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_prod_inhibit_time_us, { "Production Inhibit Time (us)", "cip.network_segment.prod_inhibit", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{ &hf_cip_seg_network_size, { "Network Segment Length", "cip.network_segment.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ &hf_cip_seg_network_subtype, { "Extended Segment Subtype", "cip.network_segment.subtype", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } },
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{ &hf_cip_seg_safety_format, { "Safety Format", "cip.safety_segment.format", FT_UINT8, BASE_DEC, VALS(cip_safety_segment_format_type_vals), 0, NULL, HFILL }},
{ &hf_cip_seg_safety_reserved, { "Reserved", "cip.safety_segment.reserved", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_configuration_crc, { "Configuration CRC", "cip.safety_segment.configuration_crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_configuration_timestamp, { "Configuration Timestamp", "cip.safety_segment.configuration_timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_configuration_date, { "Configuration (Manual) Date", "cip.safety_segment.configuration_date", FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL }},
{ &hf_cip_seg_safety_configuration_time, { "Configuration (Manual) Time", "cip.safety_segment.configuration_time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_time_correction_epi, { "Time Correction EPI", "cip.safety_segment.time_correction_eri", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_time_correction_net_params, { "Time Correction Network Connection Parameters", "cip.safety_segment.time_correction.net_params", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_time_correction_own, { "Owner", "cip.safety_segment.time_correction.owner", FT_UINT16, BASE_DEC, VALS(cip_con_owner_vals), 0x8000, "Time Correction: Redundant owner bit", HFILL }},
{ &hf_cip_seg_safety_time_correction_typ, { "Connection Type", "cip.safety_segment.time_correction.type", FT_UINT16, BASE_DEC, VALS(cip_con_type_vals), 0x6000, "Time Correction: Connection type", HFILL }},
{ &hf_cip_seg_safety_time_correction_prio, { "Priority", "cip.safety_segment.time_correction.prio", FT_UINT16, BASE_DEC, VALS(cip_con_prio_vals), 0x0C00, "Time Correction: Connection priority", HFILL }},
{ &hf_cip_seg_safety_time_correction_fixed_var, { "Connection Size Type", "cip.safety_segment.time_correction.f_v", FT_UINT16, BASE_DEC, VALS(cip_con_fw_vals), 0x0200, "Time Correction: Fixed or variable connection size", HFILL }},
{ &hf_cip_seg_safety_time_correction_con_size, { "Connection Size", "cip.safety_segment.time_correction.consize", FT_UINT16, BASE_DEC, NULL, 0x01FF, "Time Correction: Connection size", HFILL }},
{ &hf_cip_seg_safety_tunid, { "Target UNID", "cip.safety_segment.tunid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_tunid_ssn_timestamp, { "SSN Timestamp", "cip.safety_segment.tunid.ssn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_tunid_ssn_date, { "SSN (Manual) Date", "cip.safety_segment.tunid.ssn.date", FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL }},
{ &hf_cip_seg_safety_tunid_ssn_time, { "SSN (Manual) Time", "cip.safety_segment.tunid.ssn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_tunid_macid, { "MAC ID", "cip.safety_segment.tunid.macid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_ounid, { "Originator UNID", "cip.safety_segment.ounid", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_ounid_ssn_timestamp, { "SSN Timestamp", "cip.safety_segment.tunid.ssn.timestamp", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_ounid_ssn_date, { "SSN (Manual) Date", "cip.safety_segment.tunid.ssn.date", FT_UINT16, BASE_HEX, VALS(cipsafety_ssn_date_vals), 0, NULL, HFILL }},
{ &hf_cip_seg_safety_ounid_ssn_time, { "SSN (Manual) Time", "cip.safety_segment.tunid.ssn.time", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_ounid_macid, { "MAC ID", "cip.safety_segment.ounid.macid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_ping_eri_multiplier, { "Ping Interval EPI Multiplier", "cip.safety_segment.ping_eri_multiplier", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_time_coord_msg_min_multiplier, { "Time Coord Msg Min Multiplier", "cip.safety_segment.time_coord_msg_min_multiplier", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_network_time_expected_multiplier, { "Network Time Expectation Multiplier", "cip.safety_segment.network_time_expected_multiplier", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_timeout_multiplier, { "Timeout Multiplier", "cip.safety_segment.timeout_multiplier", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_max_consumer_number, { "Max Consumer Number", "cip.safety_segment.max_consumer_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_conn_param_crc, { "Connection Param CRC", "cip.safety_segment.conn_param_crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_time_correction_conn_id, { "Time Correction Connection ID", "cip.safety_segment.time_correction_conn_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_max_fault_number, { "Max Fault Number", "cip.safety_segment.max_fault_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_init_timestamp, { "Initial Timestamp", "cip.safety_segment.init_timestamp", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_init_rollover, { "Initial Rollover Value", "cip.safety_segment.init_rollover", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_seg_safety_data, { "Safety Data", "cip.safety_segment.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_class_max_inst32, { "Max Instance", "cip.class.max_inst", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_class_num_inst32, { "Number of Instances", "cip.class.num_inst", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_reserved8, { "Reserved", "cip.reserved", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
Comment out unused hf[] entries & etc. (found by checkhf) svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
#if 0
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_reserved16, { "Reserved", "cip.reserved", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
Comment out unused hf[] entries & etc. (found by checkhf) svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
#endif
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_reserved24, { "Reserved", "cip.reserved", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_pad8, { "Pad Byte", "cip.pad", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_get_attr_list_attr_count, { "Attribute Count", "cip.getlist.attr_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_get_attr_list_attr_status, { "General Status", "cip.getlist.attr_status", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_gs_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_sc_get_attr_list_attr_data, { "Data", "cip.getlist.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_set_attr_list_attr_count, { "Attribute Count", "cip.setlist.attr_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_set_attr_list_attr_status, { "General Status", "cip.setlist.attr_status", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_gs_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_sc_set_attr_list_attr_data, { "Data", "cip.setlist.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_get_attribute_all_data, { "Data", "cip.getall.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_set_attribute_all_data, { "Data", "cip.setall.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_reset_param, { "Reset type", "cip.reset.type", FT_UINT8, BASE_DEC, VALS(cip_reset_type_vals), 0, NULL, HFILL }},
{ &hf_cip_sc_reset_data, { "Data", "cip.reset.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_start_data, { "Data", "cip.start.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_stop_data, { "Data", "cip.stop.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_create_instance, { "Instance", "cip.create.instance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_create_data, { "Data", "cip.create.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_mult_serv_pack_num_services, { "Number of Services", "cip.msp.num_services", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_mult_serv_pack_offset, { "Offset", "cip.msp.offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_delete_data, { "Data", "cip.delete.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_apply_attributes_data, { "Data", "cip.apply_attributes.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_get_attr_single_data, { "Data", "cip.getsingle.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_set_attr_single_data, { "Data", "cip.setsingle.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_find_next_object_max_instance, { "Maximum ID", "cip.find_next_object.max_instance", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_find_next_object_num_instances, { "Number of Instances:", "cip.find_next_object.num_instances", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_find_next_object_instance_item, { "Instance", "cip.find_next_object.instance", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_restore_data, { "Data", "cip.restore.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_save_data, { "Data", "cip.save.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_noop_data, { "Data", "cip.noop.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_get_member_data, { "Data", "cip.getmember.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_set_member_data, { "Data", "cip.setmember.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_insert_member_data, { "Data", "cip.insertmember.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_sc_remove_member_data, { "Data", "cip.removemember.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
Fix a number of dup hf[] filter-names probably resulting from cut/paste errs. Change-Id: I9242300b2ace3155c1506b584a90f073100a305e Reviewed-on: https://code.wireshark.org/review/5512 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-26 23:18:57 +00:00
{ &hf_cip_sc_group_sync_is_sync, { "IsSynchronized", "cip.group_sync.is_sync", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_sc_group_sync_data, { "Data", "cip.group_sync.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_data, { "Data", "cip.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_id_vendor_id, { "Vendor ID", "cip.id.vendor_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_id_device_type, { "Device Type", "cip.id.device_type", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{ &hf_id_product_code, { "Product Code", "cip.id.product_code", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_id_major_rev, { "Major Revision", "cip.id.major_rev", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_id_minor_rev, { "Minor Revision", "cip.id.minor_rev", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_id_status, { "Status", "cip.id.status", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_id_serial_number, { "Serial Number", "cip.id.serial_number", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_id_product_name, { "Product Name", "cip.id.product_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{ &hf_id_state, { "State", "cip.id.state", FT_UINT8, BASE_HEX, VALS(cip_id_state_vals), 0, NULL, HFILL } },
{ &hf_id_config_value, { "Configuration Consistency Value", "cip.id.config_value", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_id_heartbeat, { "Heartbeat Interval", "cip.id.heartbeat", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_id_status_owned, { "Owned", "cip.id.owned", FT_UINT16, BASE_DEC, NULL, 0x0001, NULL, HFILL } },
{ &hf_id_status_conf, { "Configured", "cip.id.conf", FT_UINT16, BASE_DEC, NULL, 0x0004, NULL, HFILL } },
{ &hf_id_status_extended1, { "Extended Device Status", "cip.id.ext", FT_UINT16, BASE_HEX, NULL, 0x00F0, NULL, HFILL } },
{ &hf_id_status_minor_fault_rec, { "Minor Recoverable Fault", "cip.id.minor_fault1", FT_UINT16, BASE_DEC, NULL, 0x0100, NULL, HFILL } },
{ &hf_id_status_minor_fault_unrec, { "Minor Unrecoverable Fault", "cip.id.minor_fault2", FT_UINT16, BASE_DEC, NULL, 0x0200, NULL, HFILL } },
{ &hf_id_status_major_fault_rec, { "Major Recoverable Fault", "cip.id.major_fault1", FT_UINT16, BASE_DEC, NULL, 0x0400, NULL, HFILL } },
{ &hf_id_status_major_fault_unrec, { "Major Unrecoverable Fault", "cip.id.major_fault2", FT_UINT16, BASE_DEC, NULL, 0x0800, NULL, HFILL } },
{ &hf_id_status_extended2, { "Extended Device Status 2", "cip.id.ext2", FT_UINT16, BASE_HEX, NULL, 0xF000, NULL, HFILL } },
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_msg_rout_num_classes, { "Number of Classes", "cip.mr.num_classes", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_msg_rout_classes, { "Class", "cip.mr.class", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_class_names_vals_ext, 0, NULL, HFILL }},
{ &hf_msg_rout_num_available, { "Number Available", "cip.mr.num_available", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_msg_rout_num_active, { "Number Active", "cip.mr.num_active", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_msg_rout_active_connections, { "Active Connection", "cip.mr.active_connections", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_open_requests, { "Open Requests", "cip.cm.open_requests", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_open_format_rejects, { "Open Format Rejects", "cip.cm.open_format_rejects", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_open_resource_rejects, { "Open Resource Rejects", "cip.cm.open_resource_rejects", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_other_open_rejects, { "Other Open Rejects", "cip.cm.other_open_rejects", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_close_requests, { "Close Requests", "cip.cm.close_requests", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_close_format_requests, { "Close Format Requests", "cip.cm.close_format_requests", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_close_other_requests, { "Close Other Requests", "cip.cm.close_other_requests", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_conn_timouts, { "Connection Timeouts", "cip.cm.conn_timouts", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{ &hf_conn_mgr_num_conn_entries, { "Number of Connection Entries (Bits)", "cip.cm.conn_entries", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_num_conn_entries_bytes, { "Number of Connection Entries (Bytes)", "cip.cm.conn_entries_bytes", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_conn_open_bits, { "Connection Open Bits", "cip.cm.conn_open_bits", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_conn_mgr_cpu_utilization, { "CPU Utilization", "cip.cm.cpu_util", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_conn_mgr_max_buff_size, { "Max Buff Size", "cip.cm.max_buff_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_conn_mgr_buff_size_remaining, { "Buff Size Remaining", "cip.cm.buff_remain", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
CIP: Improve string handling 1. Add support for STRINGI 2. Add File Name attribute that is a STRINGI 3. CCO Get/Set Attr All: Connection Name is STRING2 not ASCII 4. TCP/IP Host Name attribute is not just a STRING. It also needs a pad byte. 5. Minor: Fix byte highlighting for CCO I/O Mapping tree 6. Minor: All back byte highlighting for Get Attr All Rsp individual attributes Change-Id: Ib10d6f2e86e39e8cd6335dc6b6dbebbd1c4d8e64 Reviewed-on: https://code.wireshark.org/review/18166 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-12 13:36:24 +00:00
{ &hf_stringi_number_char, { "Number of Characters", "cip.stringi.num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_stringi_language_char, { "Language Chars", "cip.stringi.language_char", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
{ &hf_stringi_char_string_struct, { "Char String Struct", "cip.stringi.char_string_struct", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } },
{ &hf_stringi_char_set, { "Char Set", "cip.stringi.char_set", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_stringi_international_string, { "International String", "cip.stringi.int_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
{ &hf_file_filename, { "File Name", "cip.file.file_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{ &hf_time_sync_ptp_enable, { "PTP Enable", "cip.time_sync.ptp_enable", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0, NULL, HFILL }},
{ &hf_time_sync_is_synchronized, { "Is Synchronized", "cip.time_sync.is_synchronized", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0, NULL, HFILL }},
{ &hf_time_sync_sys_time_micro, { "System Time (Microseconds)", "cip.time_sync.sys_time_micro", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_sys_time_nano, { "System Time (Nanoseconds)", "cip.time_sync.sys_time_nano", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_offset_from_master, { "Offset from Master", "cip.time_sync.offset_from_master", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_max_offset_from_master, { "Max Offset from Master", "cip.time_sync.max_offset_from_master", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_mean_path_delay_to_master, { "Mean Path Delay To Master", "cip.time_sync.mean_path_delay_to_master", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_clock_id, { "Clock Identity", "cip.time_sync.gm_clock.clock_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_clock_class, { "Clock Class", "cip.time_sync.gm_clock.clock_class", FT_UINT16, BASE_DEC, VALS(cip_time_sync_clock_class_vals), 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_accuracy, { "Time Accuracy", "cip.time_sync.gm_clock.time_accuracy", FT_UINT16, BASE_DEC, VALS(cip_time_sync_time_accuracy_vals), 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_offset_scaled_log_variance, { "Offset Scaled Log Variance", "cip.time_sync.gm_clock.offset_scaled_log_variance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_current_utc_offset, { "Current UTC Offset", "cip.time_sync.gm_clock.current_utc_offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_property_flags, { "Time Property Flags", "cip.time_sync.gm_clock.time_property_flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_property_flags_leap61, { "Leap indicator 61", "cip.time_sync.gm_clock.time_property_flags.leap61", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x01, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_property_flags_leap59, { "Leap indicator 59", "cip.time_sync.gm_clock.time_property_flags.leap59", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x02, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_property_flags_current_utc_valid, { "Current UTC Offset Valid", "cip.time_sync.gm_clock.time_property_flags.current_utc_valid", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x04, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_property_flags_ptp_timescale, { "PTP Timescale", "cip.time_sync.gm_clock.time_property_flags.ptp_timescale", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x08, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_property_flags_time_traceable, { "Time traceable", "cip.time_sync.gm_clock.time_property_flags.time_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x10, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_property_flags_freq_traceable, { "Frequency traceable", "cip.time_sync.gm_clock.time_property_flags.freq_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x20, NULL, HFILL }},
{ &hf_time_sync_gm_clock_time_source, { "Time Source", "cip.time_sync.gm_clock.time_source", FT_UINT16, BASE_DEC, VALS(cip_time_sync_time_source_vals), 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_priority1, { "Priority1", "cip.time_sync.gm_clock.priority1", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_gm_clock_priority2, { "Priority2", "cip.time_sync.gm_clock.priority2", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_parent_clock_clock_id, { "Clock Identity", "cip.time_sync.parent_clock.clock_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_parent_clock_port_number, { "Port Number", "cip.time_sync.parent_clock.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_parent_clock_observed_offset_scaled_log_variance, { "Observed Offset Scaled Log Variance", "cip.time_sync.parent_clock.observed_offset_scaled_log_variance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_parent_clock_observed_phase_change_rate, { "Observed Phase Change Rate", "cip.time_sync.parent_clock.observed_phase_change_rate", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_local_clock_clock_id, { "Clock Identity", "cip.time_sync.local_clock.clock_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_local_clock_clock_class, { "Clock Class", "cip.time_sync.local_clock.clock_class", FT_UINT16, BASE_DEC, VALS(cip_time_sync_clock_class_vals), 0, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_accuracy, { "Time Accuracy", "cip.time_sync.local_clock.time_accuracy", FT_UINT16, BASE_DEC, VALS(cip_time_sync_time_accuracy_vals), 0, NULL, HFILL }},
{ &hf_time_sync_local_clock_offset_scaled_log_variance, { "Offset Scaled Log Variance", "cip.time_sync.local_clock.offset_scaled_log_variance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_local_clock_current_utc_offset, { "Current UTC Offset", "cip.time_sync.local_clock.current_utc_offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_property_flags, { "Time Property Flags", "cip.time_sync.local_clock.time_property_flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_property_flags_leap61, { "Leap indicator 61", "cip.time_sync.local_clock.time_property_flags.leap61", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x01, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_property_flags_leap59, { "Leap indicator 59", "cip.time_sync.local_clock.time_property_flags.leap59", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x02, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_property_flags_current_utc_valid, { "Current UTC Offset Valid", "cip.time_sync.local_clock.time_property_flags.current_utc_valid", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x04, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_property_flags_ptp_timescale, { "PTP Timescale", "cip.time_sync.local_clock.time_property_flags.ptp_timescale", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x08, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_property_flags_time_traceable, { "Time traceable", "cip.time_sync.local_clock.time_property_flags.time_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x10, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_property_flags_freq_traceable, { "Frequency traceable", "cip.time_sync.local_clock.time_property_flags.freq_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x20, NULL, HFILL }},
{ &hf_time_sync_local_clock_time_source, { "Time Source", "cip.time_sync.local_clock.time_source", FT_UINT16, BASE_DEC, VALS(cip_time_sync_time_source_vals), 0, NULL, HFILL }},
{ &hf_time_sync_num_ports, { "Port Number", "cip.time_sync.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_state_info_num_ports, { "Number of Ports", "cip.time_sync.port_state_info.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_state_info_port_num, { "Port Number", "cip.time_sync.port_state_info.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_state_info_port_state, { "Port State", "cip.time_sync.port_state_info.port_state", FT_UINT16, BASE_DEC, VALS(cip_time_sync_port_state_vals), 0, NULL, HFILL }},
{ &hf_time_sync_port_enable_cfg_num_ports, { "Number of Ports", "cip.time_sync.port_enable_cfg.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_enable_cfg_port_num, { "Port Number", "cip.time_sync.port_enable_cfg.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_enable_cfg_port_enable, { "Port Enable", "cip.time_sync.port_enable_cfg.port_enable", FT_BOOLEAN, 16, TFS(&tfs_enabled_disabled), 0, NULL, HFILL }},
{ &hf_time_sync_port_log_announce_num_ports, { "Number of Ports", "cip.time_sync.port_log_announce.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_log_announce_port_num, { "Port Number", "cip.time_sync.port_log_announce.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_log_announce_interval, { "Port Log Announce Interval", "cip.time_sync.port_log_announce.interval", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_log_sync_num_ports, { "Number of Ports", "cip.time_sync.port_log_sync.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_log_sync_port_num, { "Port Number", "cip.time_sync.port_log_sync.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_log_sync_port_log_sync_interval, { "Port Log Sync Interval", "cip.time_sync.port_log_sync.port_log_sync_interval", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_priority1, { "Priority1", "cip.time_sync.priority1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_priority2, { "Priority2", "cip.time_sync.priority2", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_domain_number, { "Domain number", "cip.time_sync.domain_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_clock_type, { "Clock Type", "cip.time_sync.clock_type", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_clock_type_ordinary, { "Ordinary Clock", "cip.time_sync.clock_type.ordinary", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0080, NULL, HFILL }},
{ &hf_time_sync_clock_type_boundary, { "Boundary Clock", "cip.time_sync.clock_type.boundary", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0040, NULL, HFILL }},
{ &hf_time_sync_clock_type_end_to_end, { "End-to-End Transparent Clock", "cip.time_sync.clock_type.end_to_end", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0010, NULL, HFILL }},
{ &hf_time_sync_clock_type_management, { "Management Node", "cip.time_sync.clock_type.management", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0008, NULL, HFILL }},
{ &hf_time_sync_clock_type_slave_only, { "Slave Only", "cip.time_sync.clock_type.slave_only", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0100, NULL, HFILL }},
{ &hf_time_sync_manufacture_id_oui, { "Manufacture Identity OUI", "cip.time_sync.manufacture_id.oui", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_manufacture_id_reserved, { "Reserved", "cip.time_sync.manufacture_id.reserved", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_prod_desc_size, { "Product Description Size", "cip.time_sync.prod_desc_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_prod_desc_str, { "Product Description", "cip.time_sync.prod_desc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_revision_data_size, { "Revision Data Size", "cip.time_sync.revision_data_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_revision_data_str, { "Revision Data", "cip.time_sync.revision_data", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_user_desc_size, { "User Description Size", "cip.time_sync.user_desc_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_user_desc_str, { "User Description", "cip.time_sync.user_desc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_profile_id_info_num_ports, { "Number of Ports", "cip.time_sync.port_profile_id_info.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_profile_id_info_port_num, { "Port Number", "cip.time_sync.port_profile_id_info.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_profile_id_info_profile_id, { "Port Profile Identity", "cip.time_sync.port_profile_id_info.profile_id", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_phys_addr_info_num_ports, { "Number of Ports", "cip.time_sync.port_phys_addr_info.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_phys_addr_info_port_num, { "Port Number", "cip.time_sync.port_phys_addr_info.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_phys_addr_info_phys_proto, { "Physical Protocol", "cip.time_sync.port_profile_id_info.phys_proto", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_phys_addr_info_addr_size, { "Size of Address", "cip.time_sync.port_phys_addr_info.addr_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
Comment out unused hf[] entries & etc. (found by checkhf) svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
#if 0
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{ &hf_time_sync_port_phys_addr_info_phys_addr, { "Port Physical Address", "cip.time_sync.port_profile_id_info.phys_addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
Comment out unused hf[] entries & etc. (found by checkhf) svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
#endif
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
{ &hf_time_sync_port_proto_addr_info_num_ports, { "Number of Ports", "cip.time_sync.port_proto_addr_info.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_proto_addr_info_port_num, { "Port Number", "cip.time_sync.port_proto_addr_info.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_proto_addr_info_network_proto, { "Network Protocol", "cip.time_sync.port_proto_addr_info.network_proto", FT_UINT16, BASE_DEC, VALS(cip_time_sync_network_protocol_vals), 0, NULL, HFILL }},
{ &hf_time_sync_port_proto_addr_info_addr_size, { "Size of Address", "cip.time_sync.port_proto_addr_info.addr_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_port_proto_addr_info_port_proto_addr, { "Port Protocol Address", "cip.time_sync.port_profile_id_info.port_proto_addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_steps_removed, { "Steps Removed", "cip.time_sync.steps_removed", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_sys_time_and_offset_time, { "System Time (Microseconds)", "cip.time_sync.sys_time_and_offset.time", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_time_sync_sys_time_and_offset_offset, { "System Offset (Microseconds)", "cip.time_sync.sys_time_and_offset.offset", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
Add CIP Security objects These objects are defined in Volume 8, but it doesn't make sense to create a new dissector file for them, so just distribute them where it makes the most sense in the existing CIP dissectors. Also do some conversions to proto_tree_add_bitmask while in the neighborhood. Add support for EtherNet/IP over DTLS/TLS. Change-Id: I4e658e8871eebb222816229de7594ff766264308 Reviewed-on: https://code.wireshark.org/review/13710 Reviewed-by: D. Ulis <daulis0@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-28 21:34:14 +00:00
{ &hf_cip_security_state, { "State", "cip.security.state", FT_UINT8, BASE_DEC, VALS(cip_security_state_vals), 0, NULL, HFILL }},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{ &hf_port_entry_port, { "Entry Port", "cip.port.entry_port", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
CIP: Attribute updates 1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 20:21:13 +00:00
{ &hf_port_type, { "Port Type", "cip.port.type", FT_UINT16, BASE_DEC | BASE_RANGE_STRING, RVALS(cip_port_type_vals), 0, NULL, HFILL } },
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{ &hf_port_number, { "Port Number", "cip.port.number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_port_min_node_num, { "Minimum Node Number", "cip.port.min_node", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_port_max_node_num, { "Maximum Node Number", "cip.port.max_node", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_port_name, { "Port Name", "cip.port.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
{ &hf_conn_path_class, { "CIP Connection Path Class", "cip.conn_path_class", FT_UINT16, BASE_HEX | BASE_EXT_STRING, &cip_class_names_vals_ext, 0, NULL, HFILL }},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{ &hf_path_len_usint, { "Path Length (words)", "cip.path_len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
{ &hf_path_len_uint, { "Path Length (words)", "cip.path_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL } },
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
};
static hf_register_info hf_cm[] = {
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
{ &hf_cip_cm_sc, { "Service", "cip.cm.sc", FT_UINT8, BASE_HEX, VALS(cip_sc_vals_cm), CIP_SC_MASK, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_cm_genstat, { "General Status", "cip.cm.genstat", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &cip_gs_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cm_addstat_size, { "Additional Status Size", "cip.cm.addstat_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ext_status, { "Extended Status", "cip.cm.ext_status", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_cm_ext_st_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cm_add_status, { "Additional Status", "cip.cm.addstat", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_priority, { "Priority", "cip.cm.priority", FT_UINT8, BASE_DEC, NULL, 0x10, NULL, HFILL }},
{ &hf_cip_cm_tick_time, { "Tick time", "cip.cm.tick_time", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }},
{ &hf_cip_cm_timeout_tick, { "Time-out ticks", "cip.cm.timeout_tick", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_timeout, { "Actual Time Out", "cip.cm.timeout", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ot_connid, { "O->T Network Connection ID", "cip.cm.ot_connid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_to_connid, { "T->O Network Connection ID", "cip.cm.to_connid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_conn_serial_num, { "Connection Serial Number", "cip.cm.conn_serial_num", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_vendor, { "Vendor ID", "cip.cm.vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cm_timeout_multiplier, { "Connection Timeout Multiplier", "cip.cm.timeout_multiplier", FT_UINT8, BASE_DEC, VALS(cip_con_time_mult_vals), 0, NULL, HFILL }},
{ &hf_cip_cm_ot_rpi, { "O->T RPI", "cip.cm.otrpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ot_net_params32, { "O->T Network Connection Parameters", "cip.cm.ot_net_params", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ot_net_params16, { "O->T Network Connection Parameters", "cip.cm.ot_net_params", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_to_rpi, { "T->O RPI", "cip.cm.torpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_to_net_params32, { "T->O Network Connection Parameters", "cip.cm.to_net_params", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_to_net_params16, { "T->O Network Connection Parameters", "cip.cm.to_net_params", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_transport_type_trigger, { "Transport Type/Trigger", "cip.cm.transport_type_trigger", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_conn_path_size, { "Connection Path Size", "cip.cm.connpath_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ot_api, { "O->T API", "cip.cm.otapi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_to_api, { "T->O API", "cip.cm.toapi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_app_reply_size, { "Application Reply Size", "cip.cm.app_reply_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_app_reply_data , { "Application Reply", "cip.cm.app_reply_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
{ &hf_cip_cm_consumer_number, { "Consumer Number", "cip.cm.consumer_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_targ_vendor_id, { "Target Vendor ID", "cip.cm.targ_vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cm_targ_dev_serial_num, { "Target Device Serial Number", "cip.cm.targ_dev_serial_num", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_targ_conn_serial_num, { "Target Connection Serial Number", "cip.cm.targ_conn_serial_num", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_initial_timestamp, { "Initial Timestamp", "cip.cm.initial_timestamp", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_initial_rollover, { "Initial Rollover Value", "cip.cm.initial_rollover", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_cm_remain_path_size, { "Remaining Path Size", "cip.cm.remain_path_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_msg_req_size, { "Message Request Size", "cip.cm.msg_req_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_route_path_size, { "Route Path Size", "cip.cm.route_path_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_orig_serial_num, { "Originator Serial Number", "cip.cm.orig_serial_num", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_fwo_con_size, { "Connection Size", "cip.cm.fwo.consize", FT_UINT16, BASE_DEC, NULL, 0x01FF, "Fwd Open: Connection size", HFILL }},
{ &hf_cip_cm_lfwo_con_size, { "Connection Size", "cip.cm.fwo.consize", FT_UINT32, BASE_DEC, NULL, 0xFFFF, "Large Fwd Open: Connection size", HFILL }},
{ &hf_cip_cm_fwo_fixed_var, { "Connection Size Type", "cip.cm.fwo.f_v", FT_UINT16, BASE_DEC, VALS(cip_con_fw_vals), 0x0200, "Fwd Open: Fixed or variable connection size", HFILL }},
{ &hf_cip_cm_lfwo_fixed_var, { "Connection Size Type", "cip.cm.fwo.f_v", FT_UINT32, BASE_DEC, VALS(cip_con_fw_vals), 0x02000000, "Large Fwd Open: Fixed or variable connection size", HFILL }},
{ &hf_cip_cm_fwo_prio, { "Priority", "cip.cm.fwo.prio", FT_UINT16, BASE_DEC, VALS(cip_con_prio_vals), 0x0C00, "Fwd Open: Connection priority", HFILL }},
{ &hf_cip_cm_lfwo_prio, { "Priority", "cip.cm.fwo.prio", FT_UINT32, BASE_DEC, VALS(cip_con_prio_vals), 0x0C000000, "Large Fwd Open: Connection priority", HFILL }},
{ &hf_cip_cm_fwo_typ, { "Connection Type", "cip.cm.fwo.type", FT_UINT16, BASE_DEC, VALS(cip_con_type_vals), 0x6000, "Fwd Open: Connection type", HFILL }},
{ &hf_cip_cm_lfwo_typ, { "Connection Type", "cip.cm.fwo.type", FT_UINT32, BASE_DEC, VALS(cip_con_type_vals), 0x60000000, "Large Fwd Open: Connection type", HFILL }},
{ &hf_cip_cm_fwo_own, { "Owner", "cip.cm.fwo.owner", FT_UINT16, BASE_DEC, VALS(cip_con_owner_vals), 0x8000, "Fwd Open: Redundant owner bit", HFILL }},
{ &hf_cip_cm_lfwo_own, { "Owner", "cip.cm.fwo.owner", FT_UINT32, BASE_DEC, VALS(cip_con_owner_vals), 0x80000000, "Large Fwd Open: Redundant owner bit", HFILL }},
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{ &hf_cip_cm_fwo_dir, { "Direction", "cip.cm.fwo.dir", FT_UINT8, BASE_DEC, VALS(cip_con_dir_vals), CI_PRODUCTION_DIR_MASK, "Fwd Open: Direction", HFILL }},
{ &hf_cip_cm_fwo_trigg, { "Trigger", "cip.cm.fwo.trigger", FT_UINT8, BASE_DEC, VALS(cip_con_trigg_vals), CI_PRODUCTION_TRIGGER_MASK, "Fwd Open: Production trigger", HFILL }},
{ &hf_cip_cm_fwo_class, { "Class", "cip.cm.fwo.transport", FT_UINT8, BASE_DEC, VALS(cip_con_class_vals), CI_TRANSPORT_CLASS_MASK, "Fwd Open: Transport Class", HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_cm_gco_conn, { "Number of Connections", "cip.cm.gco.conn", FT_UINT8, BASE_DEC, NULL, 0, "GetConnOwner: Number of Connections", HFILL }},
{ &hf_cip_cm_gco_coo_conn, { "COO Connections", "cip.cm.gco.coo_conn", FT_UINT8, BASE_DEC, NULL, 0, "GetConnOwner: COO Connections", HFILL }},
{ &hf_cip_cm_gco_roo_conn, { "ROO Connections", "cip.cm.gco.roo_conn", FT_UINT8, BASE_DEC, NULL, 0, "GetConnOwner: ROO Connections", HFILL }},
{ &hf_cip_cm_gco_last_action, { "Last Action", "cip.cm.gco.la", FT_UINT8, BASE_DEC, VALS(cip_con_last_action_vals), 0, "GetConnOwner: Last Action", HFILL }},
{ &hf_cip_cm_ext112_ot_rpi_type, { "Trigger", "cip.cm.ext112otrpi_type", FT_UINT8, BASE_DEC, VALS(cip_cm_rpi_type_vals), 0, NULL, HFILL }},
{ &hf_cip_cm_ext112_to_rpi_type, { "Trigger", "cip.cm.ext112torpi_type", FT_UINT8, BASE_DEC, VALS(cip_cm_rpi_type_vals), 0, NULL, HFILL }},
{ &hf_cip_cm_ext112_ot_rpi, { "Acceptable O->T RPI", "cip.cm.ext112otrpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ext112_to_rpi, { "Acceptable T->O RPI", "cip.cm.ext112torpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ext126_size, { "Maximum Size", "cip.cm.ext126_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ext127_size, { "Maximum Size", "cip.cm.ext127_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cm_ext128_size, { "Maximum Size", "cip.cm.ext128_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
};
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
static hf_register_info hf_mb[] = {
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
{ &hf_cip_mb_sc, { "Service", "cip.mb.sc", FT_UINT8, BASE_HEX, VALS(cip_sc_vals_mb), CIP_SC_MASK, NULL, HFILL }},
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
{ &hf_cip_mb_read_coils_start_addr, { "Starting Address", "cip.mb.read_coils.start_addr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_coils_num_coils, { "Quantity of Coils", "cip.mb.read_coils.num_coils", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_coils_data, { "Data", "cip.mb.read_coils.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_discrete_inputs_start_addr, { "Starting Address", "cip.mb.read_discrete_inputs.start_addr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_discrete_inputs_num_inputs, { "Quantity of Inputs", "cip.mb.read_discrete_inputs.num_inputs", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_discrete_inputs_data, { "Data", "cip.mb.read_discrete_inputs.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_holding_register_start_addr, { "Starting Address", "cip.mb.read_holding_register.start_addr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_holding_register_num_registers, { "Quantity of Holding Registers", "cip.mb.read_holding_register.num_registers", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_holding_register_data, { "Data", "cip.mb.read_holding_register.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_input_register_start_addr, { "Starting Address", "cip.mb.read_input_register.start_addr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_input_register_num_registers, { "Quantity of Input Registers", "cip.mb.read_input_register.num_registers", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_read_input_register_data, { "Data", "cip.mb.read_input_register.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_coils_start_addr, { "Starting Address", "cip.mb.write_coils.start_addr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_coils_outputs_forced, { "Outputs Forced", "cip.mb.write_coils.outputs_forced", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_coils_num_coils, { "Quantity of Coils", "cip.mb.write_coils.num_coils", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_coils_data, { "Data", "cip.mb.write_coils.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_registers_start_addr, { "Starting Address", "cip.mb.write_registers.start_addr", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_registers_outputs_forced, { "Outputs Forced", "cip.mb.write_registers.outputs_forced", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_registers_num_registers, { "Quantity of Holding Registers", "cip.mb.write_registers.num_registers", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_write_registers_data, { "Data", "cip.mb.write_registers.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_mb_data, { "Data", "cip.mb.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}
};
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
static hf_register_info hf_cco[] = {
Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment) svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
{ &hf_cip_cco_sc, { "Service", "cip.cco.sc", FT_UINT8, BASE_HEX, VALS(cip_sc_vals_cco), CIP_SC_MASK, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_cco_format_number, { "Format Number", "cip.cco.format_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_edit_signature, { "Edit Signature", "cip.cco.edit_signature", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_con_flags, { "Connection Flags", "cip.cco.connflags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_con_type, { "Connection O_T", "cip.cco.con", FT_UINT16, BASE_DEC, VALS(cip_con_vals), 0x001, NULL, HFILL }},
{ &hf_cip_cco_ot_rtf, { "O->T real time transfer format", "cip.cco.otrtf", FT_UINT16, BASE_DEC, VALS(cip_con_rtf_vals), 0x000E, NULL, HFILL }},
{ &hf_cip_cco_to_rtf, { "T->O real time transfer format", "cip.cco.tortf", FT_UINT16, BASE_DEC, VALS(cip_con_rtf_vals), 0x0070, NULL, HFILL }},
{ &hf_cip_cco_tdi_vendor, { "Vendor ID", "cip.cco.tdi.vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cco_tdi_devtype, { "Device Type", "cip.cco.tdi.devtype", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &cip_devtype_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cco_tdi_prodcode, { "Product Code", "cip.cco.tdi.product_code", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_tdi_compatibility, { "Compatibility", "cip.cco.tdi.compatibility", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_tdi_comp_bit, { "Compatibility", "cip.cco.tdi.comp_bit", FT_UINT8, BASE_HEX, VALS(cip_com_bit_vals), 0x80, NULL, HFILL }},
{ &hf_cip_cco_tdi_majorrev, { "Major Revision", "cip.cco.tdi.major_rev", FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL }},
{ &hf_cip_cco_tdi_minorrev, { "Minor Revision", "cip.cco.tdi.minor_rev", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_pdi_vendor, { "Vendor ID", "cip.cco.pdi.vendor", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_vendor_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cco_pdi_devtype, { "Device Type", "cip.cco.pdi.devtype", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &cip_devtype_vals_ext, 0, NULL, HFILL }},
{ &hf_cip_cco_pdi_prodcode, { "Product Code", "cip.cco.pdi.product_code", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_pdi_compatibility, { "Compatibility", "cip.cco.pdi.compatibility", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_pdi_comp_bit, { "Compatibility", "cip.cco.pdi.comp_bit", FT_UINT8, BASE_HEX, VALS(cip_com_bit_vals), 0x80, NULL, HFILL }},
{ &hf_cip_cco_pdi_majorrev, { "Major Revision", "cip.cco.pdi.major_rev", FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL }},
{ &hf_cip_cco_pdi_minorrev, { "Minor Revision", "cip.cco.pdi.minor_rev", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_cs_data_index, { "CS Data Index Number", "cip.cco.cs_data_index", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_timeout_multiplier, { "Connection Timeout Multiplier", "cip.cco.timeout_multiplier", FT_UINT8, BASE_DEC, VALS(cip_con_time_mult_vals), 0, NULL, HFILL }},
{ &hf_cip_cco_ot_rpi, { "O->T RPI", "cip.cco.otrpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_ot_net_param32, { "O->T Network Connection Parameters", "cip.cco.ot_net_params", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_ot_net_param16, { "O->T Network Connection Parameters", "cip.cco.ot_net_params", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_to_rpi, { "T->O RPI", "cip.cco.torpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_to_net_param16, { "T->O Network Connection Parameters", "cip.cco.to_net_params", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_to_net_param32, { "T->O Network Connection Parameters", "cip.cco.to_net_params", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_transport_type_trigger, { "Transport Type/Trigger", "cip.cco.transport_type_trigger", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_fwo_con_size, { "Connection Size", "cip.cco.consize", FT_UINT16, BASE_DEC, NULL, 0x01FF, NULL, HFILL }},
{ &hf_cip_cco_lfwo_con_size, { "Connection Size", "cip.cco.consize", FT_UINT32, BASE_DEC, NULL, 0xFFFF, NULL, HFILL }},
{ &hf_cip_cco_fwo_fixed_var, { "Connection Size Type", "cip.cco.f_v", FT_UINT16, BASE_DEC, VALS(cip_con_fw_vals), 0x0200, NULL, HFILL }},
{ &hf_cip_cco_lfwo_fixed_var, { "Connection Size Type", "cip.cco.f_v", FT_UINT32, BASE_DEC, VALS(cip_con_fw_vals), 0x02000000, NULL, HFILL }},
{ &hf_cip_cco_fwo_prio, { "Priority", "cip.cco.prio", FT_UINT16, BASE_DEC, VALS(cip_con_prio_vals), 0x0C00, NULL, HFILL }},
{ &hf_cip_cco_lfwo_prio, { "Priority", "cip.cco.prio", FT_UINT32, BASE_DEC, VALS(cip_con_prio_vals), 0x0C000000, NULL, HFILL }},
{ &hf_cip_cco_fwo_typ, { "Connection Type", "cip.cco.type", FT_UINT16, BASE_DEC, VALS(cip_con_type_vals), 0x6000, NULL, HFILL }},
{ &hf_cip_cco_lfwo_typ, { "Connection Type", "cip.cco.type", FT_UINT32, BASE_DEC, VALS(cip_con_type_vals), 0x60000000, NULL, HFILL }},
{ &hf_cip_cco_fwo_own, { "Owner", "cip.cco.owner", FT_UINT16, BASE_DEC, VALS(cip_con_owner_vals), 0x8000, NULL, HFILL }},
{ &hf_cip_cco_lfwo_own, { "Owner", "cip.cco.owner", FT_UINT32, BASE_DEC, VALS(cip_con_owner_vals), 0x80000000, NULL, HFILL }},
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
{ &hf_cip_cco_fwo_dir, { "Direction", "cip.cco.dir", FT_UINT8, BASE_DEC, VALS(cip_con_dir_vals), CI_PRODUCTION_DIR_MASK, NULL, HFILL }},
{ &hf_cip_cco_fwo_trigger, { "Trigger", "cip.cco.trigger", FT_UINT8, BASE_DEC, VALS(cip_con_trigg_vals), CI_PRODUCTION_TRIGGER_MASK, NULL, HFILL }},
{ &hf_cip_cco_fwo_class, { "Class", "cip.cco.transport", FT_UINT8, BASE_DEC, VALS(cip_con_class_vals), CI_TRANSPORT_CLASS_MASK, NULL, HFILL }},
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
{ &hf_cip_cco_conn_path_size, { "Connection Path Size", "cip.cco.connpath_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_proxy_config_size, { "Proxy Config Data Size", "cip.cco.proxy_config_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_target_config_size, { "Target Config Data Size", "cip.cco.proxy_config_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_iomap_format_number, { "Format number", "cip.cco.iomap_format_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_iomap_size, { "Attribute size", "cip.cco.iomap_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_connection_disable, { "Connection Disable", "cip.cco.connection_disable", FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
{ &hf_cip_cco_net_conn_param_attr, { "Net Connection Parameter Attribute Selection", "cip.cco.net_conn_param_attr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_proxy_config_data, { "Proxy Config Data", "cip.cco.proxy_config_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_target_config_data, { "Target Config Data", "cip.cco.target_config_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_iomap_attribute, { "Attribute Data", "cip.cco.iomap", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_safety, { "Safety Parameters", "cip.cco.safety", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
Minor: use VALS macro (as per convention); Add editor modelines; Do whitespace changes. Change-Id: I6007c1b2098d06e4a892474dd07f06a7538f94ef Reviewed-on: https://code.wireshark.org/review/1843 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 00:33:22 +00:00
{ &hf_cip_cco_change_type, { "Change Type", "cip.cco.change_type", FT_UINT16, BASE_DEC, VALS(cip_cco_change_type_vals), 0, NULL, HFILL }},
Eliminate proto_tree_add_text from some dissectors. Change-Id: I398e9cf4f6882e76644aa758e12c39a39159e95f Reviewed-on: https://code.wireshark.org/review/3319 Petri-Dish: Michael Mann <mmann78@netscape.net> Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-01 14:08:57 +00:00
{ &hf_cip_cco_connection_name, { "Connection Name", "cip.cco.connection_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
{ &hf_cip_cco_ext_status, { "Extended Status", "cip.cco.ext_status", FT_UINT16, BASE_HEX|BASE_EXT_STRING, &cip_cm_ext_st_vals_ext, 0, NULL, HFILL }},
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
};
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Setup protocol subtree array */
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static gint *ett[] = {
&ett_cip_class_generic,
&ett_cip,
&ett_path,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_path_seg,
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
&ett_ekey_path,
&ett_rrsc,
&ett_mcsc,
&ett_cia_path,
&ett_data_seg,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_data_seg_data,
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
&ett_cmd_data,
&ett_port_path,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_network_seg,
From Michael Mann: 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 svn path=/trunk/; revision=41201
2012-02-27 09:30:26 +00:00
&ett_network_seg_safety,
&ett_network_seg_safety_time_correction_net_params,
&ett_cip_seg_safety_tunid,
&ett_cip_seg_safety_tunid_ssn,
&ett_cip_seg_safety_ounid,
&ett_cip_seg_safety_ounid_ssn,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_status_item,
&ett_add_status_item,
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
&ett_cip_get_attributes_all_item,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_cip_get_attribute_list,
&ett_cip_get_attribute_list_item,
&ett_cip_set_attribute_list,
&ett_cip_set_attribute_list_item,
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
&ett_cip_mult_service_packet,
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
&ett_cip_msp_offset,
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
&ett_time_sync_gm_clock_flags,
&ett_time_sync_local_clock_flags,
&ett_time_sync_port_state_info,
&ett_time_sync_port_enable_cfg,
&ett_time_sync_port_log_announce,
&ett_time_sync_port_log_sync,
&ett_time_sync_clock_type,
&ett_time_sync_port_profile_id_info,
&ett_time_sync_port_phys_addr_info,
&ett_time_sync_port_proto_addr_info,
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
&ett_id_status,
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
};
static gint *ett_cm[] = {
&ett_cip_class_cm,
&ett_cm_rrsc,
&ett_cm_mes_req,
&ett_cm_ncp,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_cm_cmd_data,
&ett_cm_ttt,
dissect CIP-Safety application reply data svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
&ett_cm_add_status_item,
&ett_cip_cm_pid,
&ett_cip_cm_safety
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
};
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
static gint *ett_mb[] = {
&ett_cip_class_mb,
&ett_mb_rrsc,
&ett_mb_cmd_data
};
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
static gint *ett_cco[] = {
&ett_cip_class_cco,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
&ett_cco_iomap,
&ett_cco_con_status,
&ett_cco_con_flag,
&ett_cco_tdi,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_cco_pdi,
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
&ett_cco_ncp,
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
&ett_cco_rrsc,
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
&ett_cco_cmd_data,
ENIP/CIP Added the start of IPv6 support for I/O conversations (waiting for spec definitions to complete). Added support for multiple messages in a single frame to be separated in the COL_INFO column. ENIP Added ListIdentity delay dissection remove check_col() CIP Added TimeSync object dissection svn path=/trunk/; revision=46020
2012-11-13 13:14:48 +00:00
&ett_cco_ttt,
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
};
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
static ei_register_info ei[] = {
{ &ei_mal_identity_revision, { "cip.malformed.id.revision", PI_MALFORMED, PI_ERROR, "Malformed Identity revision", EXPFILL }},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{ &ei_mal_identity_status, { "cip.malformed.id.status", PI_MALFORMED, PI_ERROR, "Malformed Identity status", EXPFILL } },
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
{ &ei_mal_msg_rout_num_classes, { "cip.malformed.msg_rout.num_classes", PI_MALFORMED, PI_ERROR, "Malformed Message Router Attribute 1", EXPFILL }},
{ &ei_mal_time_sync_gm_clock, { "cip.malformed.time_sync.gm_clock", PI_MALFORMED, PI_ERROR, "Malformed Grandmaster clock info", EXPFILL }},
{ &ei_mal_time_sync_parent_clock, { "cip.malformed.time_sync.parent_clock", PI_MALFORMED, PI_ERROR, "Malformed Parent clock info", EXPFILL }},
{ &ei_mal_time_sync_local_clock, { "cip.malformed.time_sync.local_clock", PI_MALFORMED, PI_ERROR, "Malformed Local clock info", EXPFILL }},
{ &ei_mal_time_sync_port_state_info, { "cip.malformed.time_sync.port_state_info", PI_MALFORMED, PI_ERROR, "Malformed Port State Info", EXPFILL }},
{ &ei_mal_time_sync_port_state_info_ports, { "cip.malformed.time_sync.port_state_info.ports", PI_MALFORMED, PI_ERROR, "Malformed Port State Info - too many ports", EXPFILL }},
{ &ei_mal_time_sync_port_enable_cfg, { "cip.malformed.time_sync.port_enable_cfg", PI_MALFORMED, PI_ERROR, "Malformed Port Enable Cfg", EXPFILL }},
{ &ei_mal_time_sync_port_enable_cfg_ports, { "cip.malformed.time_sync.port_enable_cfg.ports", PI_MALFORMED, PI_ERROR, "Malformed Port Enable Cfg - too many ports", EXPFILL }},
{ &ei_mal_time_sync_port_log_announce, { "cip.malformed.time_sync.port_log_announce", PI_MALFORMED, PI_ERROR, "Malformed Port Log Announcement Interval Cfg", EXPFILL }},
{ &ei_mal_time_sync_port_log_announce_ports, { "cip.malformed.time_sync.port_log_announce.ports", PI_MALFORMED, PI_ERROR, "Malformed Port Log Announcement Interval Cfg - too many ports", EXPFILL }},
{ &ei_mal_time_sync_port_log_sync, { "cip.malformed.time_sync.port_log_sync", PI_MALFORMED, PI_ERROR, "Malformed Port Log Sync Interval Cfg", EXPFILL }},
{ &ei_mal_time_sync_port_log_sync_ports, { "cip.malformed.time_sync.port_log_sync.ports", PI_MALFORMED, PI_ERROR, "Malformed Port Log Sync Interval Cfg - too many ports", EXPFILL }},
{ &ei_mal_time_sync_clock_type, { "cip.malformed.time_sync.clock_type", PI_MALFORMED, PI_ERROR, "Malformed Clock Type", EXPFILL }},
{ &ei_mal_time_sync_manufacture_id, { "cip.malformed.time_sync.manufacture_id", PI_MALFORMED, PI_ERROR, "Malformed Manufacture Identity", EXPFILL }},
{ &ei_mal_time_sync_prod_desc, { "cip.malformed.time_sync.prod_desc", PI_MALFORMED, PI_ERROR, "Malformed Product Description", EXPFILL }},
{ &ei_mal_time_sync_prod_desc_64, { "cip.malformed.time_sync.prod_desc.limit_64", PI_PROTOCOL, PI_WARN, "Product Description limited to 64 characters", EXPFILL }},
{ &ei_mal_time_sync_prod_desc_size, { "cip.malformed.time_sync.prod_desc.size", PI_MALFORMED, PI_ERROR, "Malformed Product Description - invalid size", EXPFILL }},
{ &ei_mal_time_sync_revision_data, { "cip.malformed.time_sync.revision_data", PI_MALFORMED, PI_ERROR, "Malformed Revision Data", EXPFILL }},
{ &ei_mal_time_sync_revision_data_32, { "cip.malformed.time_sync.revision_data.limit_32", PI_PROTOCOL, PI_WARN, "Revision Data limited to 32 characters", EXPFILL }},
{ &ei_mal_time_sync_revision_data_size, { "cip.malformed.time_sync.revision_data.size", PI_MALFORMED, PI_ERROR, "Malformed Revision Data - invalid size", EXPFILL }},
{ &ei_mal_time_sync_user_desc, { "cip.malformed.time_sync.user_desc", PI_MALFORMED, PI_ERROR, "Malformed User Description", EXPFILL }},
{ &ei_mal_time_sync_user_desc_128, { "cip.malformed.time_sync.user_desc.limit_128", PI_PROTOCOL, PI_WARN, "User Description limited to 128 characters", EXPFILL }},
{ &ei_mal_time_sync_user_desc_size, { "cip.malformed.time_sync.user_desc.size", PI_MALFORMED, PI_ERROR, "Malformed User Description - invalid size", EXPFILL }},
{ &ei_mal_time_sync_port_profile_id_info, { "cip.malformed.time_sync.port_profile_id_info", PI_MALFORMED, PI_ERROR, "Malformed Port Profile Identity Info", EXPFILL }},
{ &ei_mal_time_sync_port_profile_id_info_ports, { "cip.malformed.time_sync.port_profile_id_info.ports", PI_MALFORMED, PI_ERROR, "Malformed Port Profile Identity Info - too many ports", EXPFILL }},
{ &ei_mal_time_sync_port_phys_addr_info, { "cip.malformed.time_sync.port_phys_addr_info", PI_MALFORMED, PI_ERROR, "Malformed Port Physical Address Info", EXPFILL }},
{ &ei_mal_time_sync_port_phys_addr_info_ports, { "cip.malformed.time_sync.port_phys_addr_info.ports", PI_MALFORMED, PI_ERROR, "Malformed Port Physical Address Info - too many ports", EXPFILL }},
{ &ei_mal_time_sync_port_proto_addr_info, { "cip.malformed.time_sync.port_proto_addr_info", PI_MALFORMED, PI_ERROR, "Malformed Port Protocol Address Info", EXPFILL }},
{ &ei_mal_time_sync_port_proto_addr_info_ports, { "cip.malformed.time_sync.port_proto_addr_info.ports", PI_MALFORMED, PI_ERROR, "Malformed Port Protocol Address Info - too many ports", EXPFILL }},
{ &ei_mal_time_sync_sys_time_and_offset, { "cip.malformed.time_sync.sys_time_and_offset", PI_MALFORMED, PI_ERROR, "Malformed System Time and Offset", EXPFILL }},
{ &ei_proto_log_seg_format, { "cip.unsupported.log_seg_format", PI_PROTOCOL, PI_WARN, "Unsupported Logical Segment Format", EXPFILL }},
{ &ei_mal_incomplete_epath, { "cip.malformed.incomplete_epath", PI_MALFORMED, PI_ERROR, "Incomplete EPATH", EXPFILL }},
{ &ei_proto_electronic_key_format, { "cip.unsupported.electronic_key_format", PI_PROTOCOL, PI_WARN, "Unsupported Electronic Key Format", EXPFILL }},
{ &ei_proto_special_segment_format, { "cip.unsupported.special_segment_format", PI_PROTOCOL, PI_WARN, "Unsupported Special Segment Format", EXPFILL }},
{ &ei_proto_log_seg_type, { "cip.unsupported.log_seg_type", PI_PROTOCOL, PI_WARN, "Unsupported Logical Segment Type", EXPFILL }},
{ &ei_proto_log_sub_seg_type, { "cip.unsupported.log_sub_seg_type", PI_PROTOCOL, PI_WARN, "Unsupported Sub-Segment Type", EXPFILL }},
CIP: Add support for all defined segment types Add support for the following segment types: 1. Port: Extended 2. Logical: Service ID 3. Logical: Extended 4. Symbolic: ASCII, Extended String, including: Double-byte, Triple-byte, Numeric (USINT, UINT, UDINT) 5. Network: Extended 6. Network: Production Inhibit Time in Microseconds Bug: 12049 Change-Id: I31b269c28c0101205cbc02f858de47106b9e7373 Reviewed-on: https://code.wireshark.org/review/13552 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-26 16:20:51 +00:00
{ &ei_proto_ext_string_format, { "cip.unsupported.ext_string_format", PI_PROTOCOL, PI_WARN, "Unsupported Extended String Format", EXPFILL } },
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
{ &ei_proto_seg_type, { "cip.unsupported.seg_type", PI_PROTOCOL, PI_WARN, "Unsupported Segment Type", EXPFILL }},
{ &ei_proto_unsupported_datatype, { "cip.unsupported.datatype", PI_PROTOCOL, PI_WARN, "Unsupported Datatype", EXPFILL }},
{ &ei_mal_serv_gal, { "cip.malformed.get_attribute_list", PI_MALFORMED, PI_ERROR, "Malformed Get Attribute List service", EXPFILL }},
{ &ei_mal_serv_gal_count, { "cip.malformed.get_attribute_list.count", PI_MALFORMED, PI_ERROR, "Malformed Get Attribute List attribute list count greater than packet size", EXPFILL }},
{ &ei_mal_serv_sal, { "cip.malformed.set_attribute_list", PI_MALFORMED, PI_ERROR, "Malformed Set Attribute List service", EXPFILL }},
{ &ei_mal_serv_sal_count, { "cip.malformed.set_attribute_list.count", PI_MALFORMED, PI_ERROR, "Malformed Set Attribute List attribute list count greater than packet size", EXPFILL }},
{ &ei_mal_msp_services, { "cip.malformed.msp.services", PI_MALFORMED, PI_WARN, "Multiple Service Packet too many services for packet", EXPFILL }},
{ &ei_mal_msp_inv_offset, { "cip.malformed.msp.inv_offset", PI_MALFORMED, PI_WARN, "Multiple Service Packet service invalid offset", EXPFILL }},
{ &ei_mal_msp_missing_services, { "cip.malformed.msp.missing_services", PI_MALFORMED, PI_ERROR, "Multiple Service Packet service missing Number of Services field", EXPFILL }},
{ &ei_mal_serv_find_next_object, { "cip.malformed.find_next_object", PI_MALFORMED, PI_ERROR, "Find Next Object service missing Number of List Members field", EXPFILL }},
{ &ei_mal_serv_find_next_object_count, { "cip.malformed.find_next_object.count", PI_MALFORMED, PI_ERROR, "Find Next Object instance list count greater than packet size", EXPFILL }},
{ &ei_mal_rpi_no_data, { "cip.malformed.rpi_no_data", PI_MALFORMED, PI_WARN, "RPI not acceptable - missing extended data", EXPFILL }},
Enhancements for EtherNet/IP and CIP EtherNet/IP 1. EtherNet Link object parsed Physical Address attribute response incorrectly. 2. Display Unknown Commands as ENIP instead of just TCP data. CIP 1. For connected data, don't interpret it as a Message Router Request/Response format when the Forward Open connection was not directed to the Message Router. Previously, this data would be incorrectly shown as explicit CIP data. In many cases, this would show as malformed. This traffic will now just display as Data in the Wireshark tree, and "Implicit Data - Class (0x123)" in the Info column. Make this data filterable by "cip.conn_path_class == 0x123". 2. Fix parsing of Unconnected Send responses. Previously, for most cases, the response was not fully parsed, and would just show "Data", or it would parse the response as if the request class was the Connection Manager, which is incorrect. Now, also show the request path of the original embedded message in the tree. 3. Add some detailed error data for malformed Forward Close response. Change-Id: I1c98ce516373d8c0ed6e049e25342f726bc370ea Reviewed-on: https://code.wireshark.org/review/12339 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: D. Ulis <daulis0@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-01 19:25:52 +00:00
{ &ei_mal_fwd_close_missing_data, { "cip.malformed.fwd_close_missing_data", PI_MALFORMED, PI_ERROR, "Forward Close response missing application reply data", EXPFILL }},
CIP: Add support for common class attributes Change-Id: Iaa297340708170e8efb2d73d0c164e0358507eb2 Reviewed-on: https://code.wireshark.org/review/12502 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>
2015-12-10 16:39:46 +00:00
{ &ei_mal_opt_attr_list, { "cip.malformed.opt_attr_list", PI_MALFORMED, PI_ERROR, "Optional attribute list missing data", EXPFILL }},
{ &ei_mal_opt_service_list, { "cip.malformed.opt_service_list", PI_MALFORMED, PI_ERROR, "Optional service list missing data", EXPFILL }},
CIP/ENIP: Attribute updates 1. More Identity attributes 2. Port attributes 3. Set Attribute List request highlighted too much attribute data 4. TCP/IP object, Attr 5 needs padding 5. Switch most attributes to use wrappers instead of dissect_epath() directly. 6. Change new Volume 8 attributes to treat path size as words instead of bytes, when parsing size+EPATH formats. Change-Id: I1b8c476475c6fbb9c7cdb99ec4a6c28934631a19 Reviewed-on: https://code.wireshark.org/review/13898 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>
2016-02-11 04:15:11 +00:00
{ &ei_mal_padded_epath_size, { "cip.malformed.epath.size", PI_MALFORMED, PI_ERROR, "Malformed EPATH vs Size", EXPFILL } },
CIP: Improve error checking 1. Expert info for cip_short_string,cip_string 2. Combine dissect_cip_multiple_service_packet_req/dissect_cip_multiple_service_packet_rsp. The formats are the same, and this ensures that all expert info checks are applied to both. 3. Remove some copy-paste in dissect_cip_generic_data Change-Id: I433990bf4389bee78d414cab8547bd2bb39498c7 Reviewed-on: https://code.wireshark.org/review/14105 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>
2016-02-23 20:14:39 +00:00
{ &ei_mal_missing_string_data, { "cip.malformed.missing_str_data", PI_MALFORMED, PI_ERROR, "Missing string data", EXPFILL } },
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
};
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
module_t *cip_module;
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_module_t* expert_cip;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Register the protocol name and description */
proto_cip = proto_register_protocol("Common Industrial Protocol",
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
"CIP", "cip");
new_register_dissector -> register_dissector for dissector directory. Change-Id: Ie39ef054a4a942687bd079f3a4d8c2cc55d5f22c Reviewed-on: https://code.wireshark.org/review/12485 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 04:04:01 +00:00
register_dissector("cip_implicit", dissect_cip_implicit, proto_cip);
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Required function calls to register the header fields and subtrees used */
#include <prefs.h> not req'd; Fix indentation to be conistent svn path=/trunk/; revision=26086
2008-08-25 20:41:05 +00:00
proto_register_field_array(proto_cip, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
first batch of dissectors to use the new expert info API. svn path=/trunk/; revision=49560
2013-05-24 18:02:54 +00:00
expert_cip = expert_register_protocol(proto_cip);
expert_register_field_array(expert_cip, ei, array_length(ei));
CIP/ENIP: Enhance Info column display 1. ENIP: When there is more than one ENIP command in a given TCP packet, display both in the Info column. Previously, only 1 would be displayed. 2. CIP: Services need a context to be able to interpret properly. Display the Class or Symbol name in the Info column in an object oriented manner for Request Paths, or Connection Paths. 3. CIP: Display the request path/service in a CIP response, instead of just "Success". These changes make it visually easier to identify traffic. 4. CIP: For the Info column, make Multiple Service Packet formatting a little more consistent regarding the divider between embedded packets. Previously, it would display 2 different separator types "," and "|". 5. CIP: Add preference to enable/disable "Display enhanced Info column data" Change-Id: I7e95bc144588c0925137e01abbc814babb494d19 Reviewed-on: https://code.wireshark.org/review/13632 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>
2016-02-01 03:36:58 +00:00
cip_module = prefs_register_protocol(proto_cip, NULL);
prefs_register_bool_preference(cip_module, "enhanced_info_column",
"Display enhanced Info column data",
"Whether the CIP dissector should display enhanced/verbose data in the Info column for CIP explicit messages",
&cip_enhanced_info_column);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
subdissector_class_table = register_dissector_table("cip.class.iface",
Don't do any Decode As stuff for dissector tables not used with Decode As. Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30 22:51:54 +00:00
"CIP Class Interface Handle", proto_cip, FT_UINT32, BASE_HEX);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
subdissector_symbol_table = register_dissector_table("cip.data_segment.iface",
Don't do any Decode As stuff for dissector tables not used with Decode As. Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30 22:51:54 +00:00
"CIP Data Segment Interface Handle", proto_cip, FT_UINT32, BASE_HEX);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Register the protocol name and description */
proto_cip_class_generic = proto_register_protocol("CIP Class Generic",
"CIPCLS", "cipcls");
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Register the protocol name and description */
proto_cip_class_cm = proto_register_protocol("CIP Connection Manager",
"CIPCM", "cipcm");
proto_register_field_array(proto_cip_class_cm, hf_cm, array_length(hf_cm));
proto_register_subtree_array(ett_cm, array_length(ett_cm));
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
proto_cip_class_mb = proto_register_protocol("CIP Modbus Object",
"CIPMB", "cipmb");
proto_register_field_array(proto_cip_class_mb, hf_mb, array_length(hf_mb));
proto_register_subtree_array(ett_mb, array_length(ett_mb));
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
proto_cip_class_cco = proto_register_protocol("CIP Connection Configuration Object",
"CIPCCO", "cipcco");
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
proto_register_field_array(proto_cip_class_cco, hf_cco, array_length(hf_cco));
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
proto_register_subtree_array(ett_cco, array_length(ett_cco));
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
/* Register a heuristic dissector on the service of the message so objects
* can override the dissector for common services */
Associate dissector tables and heuristic subdissector lists with a protocol. 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-03-13 11:51:45 +00:00
heur_subdissector_service = register_heur_dissector_list("cip.sc", proto_cip);
From Michael Mann: Improved CIP and ENIP dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416 svn path=/trunk/; revision=39595
2011-10-26 04:55:21 +00:00
CIP: Add support for Get Attributes All Get Attributes All is a predefined list of existing attribute IDs for a given class. Add a new index for each attribute for their place in GetAttributesAll response. Then a hash table of classes for existing attributes are created to handle the GetAttributesAll service. Added more TCP/IP object attributes since more have been added to the spec. Moved TCP/IP object attributes all to ENIP dissector. Bug: 11996 Change-Id: I7f50c9aadf04efdb17ef31f39e6a991c0a84bef2 Reviewed-on: https://code.wireshark.org/review/13186 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-20 15:50:44 +00:00
build_get_attr_all_table();
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
} /* end of proto_register_cip() */
void
proto_reg_handoff_cip(void)
{
registered init routine actions need be done just once in proto_reg_handoff...(); localize two handles to proto_reg_handoff(); svn path=/trunk/; revision=44372
2012-08-09 03:02:15 +00:00
dissector_handle_t cip_handle;
dissector_handle_t cip_class_mb_handle;
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
/* Create dissector handles */
Revert changes committed by an accident. Will be committed again later. svn path=/trunk/; revision=28779
2009-06-19 06:15:52 +00:00
/* Register for UCMM CIP data, using EtherNet/IP SendRRData service*/
/* Register for Connected CIP data, using EtherNet/IP SendUnitData service*/
new_create_dissector_handle -> create_dissector_handle for dissector directory. Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:49:44 +00:00
cip_handle = create_dissector_handle( dissect_cip, proto_cip );
Rename the routines that handle dissector tables with unsigned integer 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.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint( "enip.srrd.iface", ENIP_CIP_INTERFACE, cip_handle );
dissector_add_uint( "enip.sud.iface", ENIP_CIP_INTERFACE, cip_handle );
Moved setting of length2 to make it always set. svn path=/trunk/; revision=28777
2009-06-19 05:45:40 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Create and register dissector handle for generic class */
new_create_dissector_handle -> create_dissector_handle for dissector directory. Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:49:44 +00:00
cip_class_generic_handle = create_dissector_handle( dissect_cip_class_generic, proto_cip_class_generic );
Rename the routines that handle dissector tables with unsigned integer 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.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint( "cip.class.iface", 0, cip_class_generic_handle );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Create and register dissector handle for Connection Manager */
new_create_dissector_handle -> create_dissector_handle for dissector directory. Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:49:44 +00:00
cip_class_cm_handle = create_dissector_handle( dissect_cip_class_cm, proto_cip_class_cm );
Rename the routines that handle dissector tables with unsigned integer 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.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint( "cip.class.iface", CI_CLS_CM, cip_class_cm_handle );
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
/* Create and register dissector handle for Modbus Object */
new_create_dissector_handle -> create_dissector_handle for dissector directory. Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:49:44 +00:00
cip_class_mb_handle = create_dissector_handle( dissect_cip_class_mb, proto_cip_class_mb );
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
dissector_add_uint( "cip.class.iface", CI_CLS_MB, cip_class_mb_handle );
Manually add protocol dependencies derived from find_dissector. Started by grepping call_dissector_with_data, call_dissector_only and call_dissector and traced the handles passed into them to a find_dissector within the dissector. Then replaced find_dissector with find_dissector_add_dependency and added the protocol id from the dissector. "data" dissector was not considered to be a dependency. Change-Id: I15d0d77301306587ef8e7af5876e74231816890d Reviewed-on: https://code.wireshark.org/review/14509 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-16 13:02:52 +00:00
modbus_handle = find_dissector_add_dependency("modbus", proto_cip_class_mb);
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6697 Modbus object support for CIP dissector Support for the Modbus object within the CIP dissector. Essentially wraps the Modbus protocol within a CIP object. Also included update to Modbus error code per http://www.wireshark.org/lists/wireshark-dev/201111/msg00187.html svn path=/trunk/; revision=40371
2012-01-04 13:29:48 +00:00
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
/* Create and register dissector handle for Connection Configuration Object */
new_create_dissector_handle -> create_dissector_handle for dissector directory. Some of the ASN.1 dissectors still generate a new_create_dissector_handle from the tool itself, so leave those for now. Change-Id: Ic6e5803b1444d7ac24070949f5fd557909a5641f Reviewed-on: https://code.wireshark.org/review/12484 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-09 03:49:44 +00:00
cip_class_cco_handle = create_dissector_handle( dissect_cip_class_cco, proto_cip_class_cco );
Rename the routines that handle dissector tables with unsigned integer 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.) svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
dissector_add_uint( "cip.class.iface", CI_CLS_CCO, cip_class_cco_handle );
Remove all preferences related to enabling/disabling heuristic dissectors. 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-13 00:40:31 +00:00
heur_dissector_add("cip.sc", dissect_class_cco_heur, "CIP Connection Configuration Object", "cco_cip", proto_cip_class_cco, HEURISTIC_ENABLE);
From Joakim Wiberg via bug 3103: Various improvements to the CIP and ENIP dissectors. From me: Updated to latest trunk changes. svn path=/trunk/; revision=28844
2009-06-26 02:38:23 +00:00
registered init routine actions need be done just once in proto_reg_handoff...(); localize two handles to proto_reg_handoff(); svn path=/trunk/; revision=44372
2012-08-09 03:02:15 +00:00
proto_enip = proto_get_id_by_filter_name( "enip" );
proto_modbus = proto_get_id_by_filter_name( "modbus" );
From Magnus Hansson: move CIP protocol to own dissector clean up code and fix variable names add more info to info column fixed decoding of embedded messages in Unconnected send and Multiple Service packets add more info to path decoding add more filter options/clean up complete CIP vendor codes svn path=/trunk/; revision=12070
2004-09-23 17:34:35 +00:00
} /* end of proto_reg_handoff_cip() */
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
/*
* Editor modelines
*
* Local Variables:
* c-basic-offset: 3
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
* tab-width: 8
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
* indent-tabs-mode: nil
* End:
*
Fix ex "modeline" so it works; See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748 svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
* ex: set shiftwidth=3 tabstop=8 expandtab:
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 : Added support for the following services of the Connection Manager object: LargeForwardOpen GetConnectionOwner Added support for the following services of the Connection Configuration Object: GetAttributeAll SetAttributeAll From me: Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3. svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00
* :indentSize=3:tabSize=8:noTabs=true:
Remove unneeded #include <stdlib.h>; Use consistent indentation; Add editor modelines; Use #if 0/#endif to comment out code instead of /* */. svn path=/trunk/; revision=36913
2011-04-27 19:24:32 +00:00
*/