diff options
| author | Dylan Ulis <daulis0@gmail.com> | 2018-11-27 15:23:41 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-12-09 07:19:01 +0000 |
| commit | 5762fc617ab0f292d2905d0dccf3c6c7b7e8c018 (patch) | |
| tree | 1e172aa6751a076087852c644e9c4e72c79d3e12 /epan/dissectors/packet-cip.h | |
| parent | 98f5470352b426c46bbbd45443b9974f2b278a19 (diff) | |
CIP: Improve connected data information
1. For each connected data message, display generated connection
information including:
a. Connection Path from the initial connection
b. API values
c. Forward Open packet number. (This already existed, but moving it to a
consistent place in the tree)
2. Display O->T or T->O in the Info column depending on the direction of data.
3. Remove cip.conn_path_class filter. This was originally added to show
which type of data is in a given packet. But, it's not really needed
anymore because we have the generated connection path in each connected
data packet now.
4. Ensure dummy structs used for Decode As menus are zeroed out.
5. memset -> zero initialization
pcaps from the following bug reports are good examples:
Bug: 14939
Bug: 6617
Bug: 14916
Bug: 14958
Change-Id: I63885a5ca41f95e04f855a1e1dcd9ab3684f7eec
Reviewed-on: https://code.wireshark.org/review/30808
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-cip.h')
| -rw-r--r-- | epan/dissectors/packet-cip.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h index 0eb8a3d929..9f48afa9cd 100644 --- a/epan/dissectors/packet-cip.h +++ b/epan/dissectors/packet-cip.h @@ -460,6 +460,9 @@ typedef struct cip_connID_info { address ipaddress; guint16 port; guint8 type; + + // Actual Packet Interval in microseconds. + guint32 api; } cip_connID_info_t; enum cip_safety_format_type {CIP_SAFETY_BASE_FORMAT, CIP_SAFETY_EXTENDED_FORMAT}; @@ -487,6 +490,8 @@ typedef struct cip_conn_info { cip_safety_epath_info_t safety; guint32 ClassID; guint32 ConnPoint; + guint32 FwdOpenPathLenBytes; + void *pFwdOpenPathData; } cip_conn_info_t; typedef struct cip_req_info { |