diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-04-02 17:15:08 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-04-04 02:21:01 +0000 |
| commit | f031fafdcc5792ba5011e2fcd7a33cbea450148c (patch) | |
| tree | 4e7192c9fd107d9c44081f2d595259399f60d4b9 /epan/dissectors/packet-cipsafety.c | |
| parent | a655c9a7f0c648b70e8b8213cfd5487b29ec69e0 (diff) | |
| download | wireshark-f031fafdcc5792ba5011e2fcd7a33cbea450148c.tar.gz | |
Add proper "Decode As" mechanism for EtherNet/IP I/O instead of preference.
Change-Id: I9d7c0f296176679b61d7ee0c4358ce409dfc4f4f
Reviewed-on: https://code.wireshark.org/review/7895
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-cipsafety.c')
| -rw-r--r-- | epan/dissectors/packet-cipsafety.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-cipsafety.c b/epan/dissectors/packet-cipsafety.c index 423a0c5814..3cf7835e37 100644 --- a/epan/dissectors/packet-cipsafety.c +++ b/epan/dissectors/packet-cipsafety.c @@ -2610,7 +2610,7 @@ proto_register_cipsafety(void) void proto_reg_handoff_cipsafety(void) { - dissector_handle_t cip_class_s_supervisor_handle; + dissector_handle_t cip_class_s_supervisor_handle, cipsafety_handle; /* Create and register dissector handle for Safety Supervisor */ cip_class_s_supervisor_handle = new_create_dissector_handle( dissect_cip_class_s_supervisor, proto_cip_class_s_supervisor ); @@ -2621,6 +2621,10 @@ proto_reg_handoff_cipsafety(void) dissector_add_uint( "cip.class.iface", CI_CLS_SAFETY_VALIDATOR, cip_class_s_validator_handle ); heur_dissector_add("cip.sc", dissect_class_svalidator_heur, proto_cip_class_s_validator); + /* Create and register dissector for I/O data handling */ + cipsafety_handle = create_dissector_handle( dissect_cipsafety, proto_cipsafety ); + dissector_add_for_decode_as("enip.io", cipsafety_handle ); + proto_cip = proto_get_id_by_filter_name( "cip" ); } |