diff options
| author | Dylan Ulis <daulis0@gmail.com> | 2018-02-02 11:47:44 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-02-03 04:19:05 +0000 |
| commit | 2d8606b584025bb80c3935aa3ecc57b512c61360 (patch) | |
| tree | 15a46232dfae902b5c7113b8e097627612936f2c /epan/dissectors/packet-cip.h | |
| parent | a4bb6c2d395ac1e30e116bc2780fa143df2dc1ab (diff) | |
CIP Motion: Support Format Revision 3
See Volume 9, version 1.2, sections "6-2.7.1.1" and "7-1.1"
1. Pass Connection Point from FwdOpen to Motion dissector, since that is now needed to parse I/O payload.
2. Move Run/Idle Header function to CIP dissector, since it's a CIP feature, not ENIP.
3. Add a protocol so that Format Revision 3 can be dissected without the Forward Open in the capture.
4. Minor: Highlight more bytes in some EPATH parsing.
5. Minor: Renaming some things to match spec wording.
Change-Id: I93626a6492be2675206d38c04fa1c7ce534c04ca
Reviewed-on: https://code.wireshark.org/review/25570
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-cip.h')
| -rw-r--r-- | epan/dissectors/packet-cip.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h index 3c18d72366..07dccd5530 100644 --- a/epan/dissectors/packet-cip.h +++ b/epan/dissectors/packet-cip.h @@ -235,6 +235,7 @@ typedef struct cip_simple_request_info { guint32 iInstance; guint32 iAttribute; guint32 iMember; + guint32 iConnPoint; } cip_simple_request_info_t; enum cip_datatype { @@ -316,6 +317,7 @@ typedef struct cip_conn_info { cip_safety_epath_info_t safety; gboolean motion; guint32 ClassID; + guint32 ConnPoint; } cip_conn_info_t; typedef struct cip_req_info { @@ -355,6 +357,7 @@ extern attribute_info_t* cip_get_attribute(guint class_id, guint instance, guint extern int dissect_cip_get_attribute_all_rsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, cip_simple_request_info_t* req_data); extern void load_cip_request_data(packet_info *pinfo, cip_simple_request_info_t *req_data); +void dissect_cip_run_idle(tvbuff_t* tvb, int offset, proto_tree* item_tree); /* ** Exported variables |