diff options
| author | D. Ulis <daulis0@gmail.com> | 2016-01-26 11:20:51 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-01-27 03:36:37 +0000 |
| commit | 59bdb4bcb6fa8deea4bdd0cbf1940acc11ef5f4d (patch) | |
| tree | 1e9bc25efe121cc802c13dd43ef13a7c8a7c7428 /epan/dissectors/packet-cip.h | |
| parent | 3cecda0246894b0f2be8cbf689b7cebb0f74e1e8 (diff) | |
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>
Diffstat (limited to 'epan/dissectors/packet-cip.h')
| -rw-r--r-- | epan/dissectors/packet-cip.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/epan/dissectors/packet-cip.h b/epan/dissectors/packet-cip.h index 817e37a744..2b87f22c55 100644 --- a/epan/dissectors/packet-cip.h +++ b/epan/dissectors/packet-cip.h @@ -161,7 +161,7 @@ #define CI_LOGICAL_SEG_ATTR_ID 0x10 #define CI_LOGICAL_SEG_SPECIAL 0x14 #define CI_LOGICAL_SEG_SERV_ID 0x18 -#define CI_LOGICAL_SEG_RES_1 0x1C +#define CI_LOGICAL_SEG_EXT_LOGICAL 0x1C #define CI_LOGICAL_SEG_FORMAT_MASK 0x03 #define CI_LOGICAL_SEG_8_BIT 0x00 @@ -181,8 +181,19 @@ #define CI_NETWORK_SEG_FIXED_TAG 0x02 #define CI_NETWORK_SEG_PROD_INHI 0x03 #define CI_NETWORK_SEG_SAFETY 0x10 +#define CI_NETWORK_SEG_PROD_INHI_US 0x11 #define CI_NETWORK_SEG_EXTENDED 0x1F +#define CI_SYMBOL_SEG_FORMAT_MASK 0xE0 +#define CI_SYMBOL_SEG_SIZE_MASK 0x1F +#define CI_SYMBOL_SEG_DOUBLE 0x20 +#define CI_SYMBOL_SEG_TRIPLE 0x40 +#define CI_SYMBOL_SEG_NUMERIC 0xC0 + +#define CI_SYMBOL_NUMERIC_USINT 6 +#define CI_SYMBOL_NUMERIC_UINT 7 +#define CI_SYMBOL_NUMERIC_UDINT 8 + #define CI_TRANSPORT_CLASS_MASK 0x0F #define CI_PRODUCTION_TRIGGER_MASK 0x70 #define CI_PRODUCTION_DIR_MASK 0x80 |