diff options
| author | Dylan Ulis <daulis0@gmail.com> | 2019-01-16 19:14:59 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-01-17 13:09:44 +0000 |
| commit | 75f9c958887dd5493cef39ff104fb3dd0c0060b1 (patch) | |
| tree | 80133c083f9ed2094d97964788ad07638e1c11e6 | |
| parent | b3fe731259f091584b61c5fe1672031bcfb00a92 (diff) | |
CIP: Add more objects
Add newer CIP objects
Change-Id: Ie1fcc219ee2d8abece8aaa9c4bbaade42f029ef9
Reviewed-on: https://code.wireshark.org/review/31568
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-cip.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 9612ae72ca..3d8c39e204 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -3,7 +3,7 @@ * CIP Home: www.odva.org * * This dissector includes items from: - * CIP Volume 1: Common Industrial Protocol, Edition 3.24 + * CIP Volume 1: Common Industrial Protocol, Edition 3.25 * CIP Volume 5: Integration of Modbus Devices into the CIP Architecture, Edition 2.17 * CIP Volume 7: CIP Safety, Edition 1.9 * @@ -2876,6 +2876,15 @@ const value_string cip_class_names_vals[] = { { 0xF6, "Ethernet Link" }, { 0xF7, "CompoNet" }, { 0xF8, "CompoNet Repeater" }, + { 0xF9, "HART Master Port" }, + { 0x100, "Protection Trip" }, + { 0x101, "Protection Alarm" }, + { 0x102, "Circuit Breaker Supervisor" }, + { 0x103, "Circuit Breaker Statistics" }, + { 0x104, "Electrical Demand" }, + { 0x105, "Electrical Statistics" }, + { 0x106, "Machine Base Data" }, + { 0x107, "HART Process Device" }, { 0, NULL } }; |