diff options
| author | Dylan Ulis <daulis0@gmail.com> | 2018-06-15 10:45:01 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-06-18 04:07:02 +0000 |
| commit | bef062e56e458006b71c612717dccd32517bc459 (patch) | |
| tree | 11ba9a005f0588d46c983d06f74888230f13e748 /epan/dissectors/packet-cip.h | |
| parent | 333e915cff0078215492dc01206edbb1d77886e7 (diff) | |
CIP: Improve I/O handling
1. Add new dissector table that allows for registration of CIP Class 0/1 I/O
against CIP Class that was used in the Forward Open. CIP Safety is still
a special case that gets checked before this table. The default handling is
generic CIP Class 0/1 I/O.
2. Changed most I/O items labelled "ENIP" to "CIP I/O". ENIP is a separate
protocol/layer, and all the I/O traffic is actually CIP. It was very
confusing explaining to people they had to look at the wrong protocol
layer in Wireshark before.
3. Add the generic Class 0/1 I/O as a separate tree layer. CIP Motion and
CIP Safety I/O were already doing this.
4. Update CIP conversation filtering naming to be more accurate.
5. Clean up some offset handling
Change-Id: I1c226fe1bd8974ed0e90640c875bef21f15f3095
Reviewed-on: https://code.wireshark.org/review/28290
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-cip.h')
| -rw-r--r-- | epan/dissectors/packet-cip.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h index 0b36d70767..847f3491aa 100644 --- a/epan/dissectors/packet-cip.h +++ b/epan/dissectors/packet-cip.h @@ -484,7 +484,6 @@ typedef struct cip_conn_info { cip_connID_info_t T2O; guint8 TransportClass_trigger; cip_safety_epath_info_t safety; - gboolean motion; guint32 ClassID; guint32 ConnPoint; } cip_conn_info_t; @@ -504,7 +503,7 @@ typedef struct cip_req_info { */ /* Depending on if a Class or Symbol segment appears in Connection Path or - a Request Path, display '->' before or after the actual name. */ + a Request Path, display '-' before or after the actual name. */ #define NO_DISPLAY 0 #define DISPLAY_CONNECTION_PATH 1 #define DISPLAY_REQUEST_PATH 2 |