diff options
| author | Dylan Ulis <daulis0@gmail.com> | 2018-05-31 07:24:26 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-06-01 05:53:13 +0000 |
| commit | c9ba7c95dfe16c55affc47741cea533866b2dc70 (patch) | |
| tree | c0a0e07c20186d1ee2367cc0b256c9093aa5ae37 /epan/dissectors/packet-enip.h | |
| parent | a7c244e4f1faa6f7c3d1d438840983725bdd1fb6 (diff) | |
CIP: Use a struct for connection triad
1. Connection Serial Number, Vendor ID, and Device Serial Number are always
used as a group. Group these as a struct to make them easier to manage.
2. Pull out common code into dissect_connection_triad()
No functional changes.
Change-Id: Ide126f8d0ea6ab8e2de5abf20e12643d5a35924d
Reviewed-on: https://code.wireshark.org/review/27926
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-enip.h')
| -rw-r--r-- | epan/dissectors/packet-enip.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-enip.h b/epan/dissectors/packet-enip.h index 19a4ad7c58..cc129c3ef6 100644 --- a/epan/dissectors/packet-enip.h +++ b/epan/dissectors/packet-enip.h @@ -92,9 +92,7 @@ typedef struct { } enip_request_info_t; typedef struct enip_conn_val { - guint16 ConnSerialNumber; - guint16 VendorID; - guint32 DeviceSerialNumber; + cip_connection_triad_t triad; guint32 O2TConnID; guint32 T2OConnID; guint8 TransportClass_trigger; @@ -114,8 +112,8 @@ enum enip_connid_type {ECIDT_UNKNOWN, ECIDT_O2T, ECIDT_T2O}; #define ENIP_REQUEST_INFO 0 #define ENIP_CONNECTION_INFO 1 -void enip_close_cip_connection( packet_info *pinfo, guint16 ConnSerialNumber, guint16 VendorID, guint32 DeviceSerialNumber ); -void enip_mark_connection_triad( packet_info *pinfo, guint16 ConnSerialNumber, guint16 VendorID, guint32 DeviceSerialNumber ); +void enip_close_cip_connection(packet_info *pinfo, const cip_connection_triad_t* triad); +void enip_mark_connection_triad(packet_info *pinfo, const cip_connection_triad_t* triad); extern attribute_info_t enip_attribute_vals[99]; |