osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Have CIP dissectors find the CIP Class dissector table, rather than have a externed global variable. 

Change-Id: Id8156680d67d65d87c156df05e8a66e2531728d2
Reviewed-on: https://code.wireshark.org/review/13709
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-01-28 14:13:30 -05:00
parent 8b0c2c3837
commit 0cd0844b52
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-cip.c
View File

@ -607,7 +607,7 @@ static expert_field ei_mal_fwd_close_missing_data = EI_INIT;
static expert_field ei_mal_opt_attr_list = EI_INIT;
static expert_field ei_mal_opt_service_list = EI_INIT;
dissector_table_t subdissector_class_table;
static dissector_table_t subdissector_class_table;
static dissector_table_t subdissector_symbol_table;
/* Translate function to string - CIP Service codes */

1
epan/dissectors/packet-cip.h
View File

@ -340,7 +340,6 @@ extern attribute_info_t* cip_get_attribute(guint class_id, guint instance, guint
/*
** Exported variables
*/
extern dissector_table_t subdissector_class_table;
extern const value_string cip_sc_rr[];
extern const value_string cip_reset_type_vals[];
extern value_string_ext cip_gs_vals_ext;

2
epan/dissectors/packet-cipsafety.c
View File

@ -45,6 +45,7 @@ static int proto_cip_class_s_supervisor = -1;
static int proto_cip_class_s_validator = -1;
static int proto_cip = -1;
static dissector_table_t subdissector_class_table;
static dissector_handle_t cip_class_s_validator_handle;
/* CIP Safety field identifiers */
@ -2595,6 +2596,7 @@ proto_reg_handoff_cipsafety(void)
dissector_add_for_decode_as("enip.io", cipsafety_handle );
proto_cip = proto_get_id_by_filter_name( "cip" );
subdissector_class_table = find_dissector_table("cip.class.iface");
}

2
epan/dissectors/packet-enip.c
View File

@ -326,6 +326,7 @@ static expert_field ei_mal_dlr_active_gateway_address = EI_INIT;
static dissector_table_t subdissector_srrd_table;
static dissector_table_t subdissector_sud_table;
static dissector_table_t subdissector_io_table;
static dissector_table_t subdissector_class_table;
static dissector_handle_t data_handle;
static dissector_handle_t arp_handle;
@ -3891,6 +3892,7 @@ proto_reg_handoff_enip(void)
dissector_add_uint("ethertype", ETHERTYPE_DLR, dlr_handle);
proto_cipsafety = proto_get_id_by_filter_name( "cipsafety" );
subdissector_class_table = find_dissector_table("cip.class.iface");
} /* end of proto_reg_handoff_enip() */