diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index 54de56216c..cb41cfb0a3 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -1071,6 +1071,7 @@ libwireshark.so.0 libwireshark0 #MINVER# prefs_register_module_alias@Base 2.9.0 prefs_register_obsolete_preference@Base 1.9.1 prefs_register_protocol@Base 1.9.1 + prefs_register_protocol_obsolete@Base 3.5.0 prefs_register_protocol_subtree@Base 1.9.1 prefs_register_range_preference@Base 1.9.1 prefs_register_stat@Base 1.9.1 diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 331ce87915..a0d7775f0a 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1692,7 +1692,7 @@ dcerpc_init_uuid(int proto, int ett, e_guid_t *uuid, guint16 ver, /* Register the samr.nt_password preference as obsolete */ /* This should be in packet-dcerpc-samr.c */ if (strcmp(filter_name, "samr") == 0) { - samr_module = prefs_register_protocol(proto, NULL); + samr_module = prefs_register_protocol_obsolete(proto); prefs_register_obsolete_preference(samr_module, "nt_password"); } } diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index 6c8456f799..a3937895e1 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -331,7 +331,7 @@ proto_register_fcoe(void) expert_fcoe = expert_register_protocol(proto_fcoe); expert_register_field_array(expert_fcoe, ei, array_length(ei)); - fcoe_module = prefs_register_protocol(proto_fcoe, NULL); + fcoe_module = prefs_register_protocol_obsolete(proto_fcoe); prefs_register_obsolete_preference(fcoe_module, "ethertype"); } diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c index f298c54288..6d684a6e91 100644 --- a/epan/dissectors/packet-flip.c +++ b/epan/dissectors/packet-flip.c @@ -440,7 +440,7 @@ proto_register_flip(void) proto_register_field_array(proto_flip, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - flip_module = prefs_register_protocol(proto_flip, NULL); + flip_module = prefs_register_protocol_obsolete(proto_flip); /* Register preferences - now obsolete because of Decode As*/ prefs_register_obsolete_preference(flip_module, "decoding_mode"); diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c index cf100b5379..e3fd806bf7 100644 --- a/epan/dissectors/packet-hdcp2.c +++ b/epan/dissectors/packet-hdcp2.c @@ -376,7 +376,7 @@ proto_register_hdcp2(void) "High bandwidth Digital Content Protection version 2", "HDCP2", "hdcp2"); - hdcp2_module = prefs_register_protocol(proto_hdcp2, proto_reg_handoff_hdcp2); + hdcp2_module = prefs_register_protocol_obsolete(proto_hdcp2); prefs_register_obsolete_preference(hdcp2_module, "enable"); proto_register_field_array(proto_hdcp2, hf, array_length(hf)); diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c index 9288af809e..67095cbddc 100644 --- a/epan/dissectors/packet-i2c.c +++ b/epan/dissectors/packet-i2c.c @@ -274,7 +274,7 @@ proto_register_i2c(void) proto_i2c_event = proto_register_protocol_in_name_only("I2C Events", "I2C Events", "i2c_event", proto_i2c, FT_PROTOCOL); proto_i2c_data = proto_register_protocol_in_name_only("I2C Data", "I2C Data", "i2c_data", proto_i2c, FT_PROTOCOL); - m = prefs_register_protocol(proto_i2c, NULL); + m = prefs_register_protocol_obsolete(proto_i2c); prefs_register_obsolete_preference(m, "type"); subdissector_table = register_decode_as_next_proto(proto_i2c, "i2c.message", "I2C messages dissector", i2c_prompt); diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index bea57bbb2c..2fcc5cb115 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -2468,7 +2468,7 @@ proto_register_ipsec(void) expert_esp = expert_register_protocol(proto_esp); expert_register_field_array(expert_esp, ei, array_length(ei)); - ah_module = prefs_register_protocol(proto_ah, NULL); + ah_module = prefs_register_protocol_obsolete(proto_ah); prefs_register_obsolete_preference(ah_module, "place_ah_payload_in_subtree"); diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 10345b67b8..11c45be58a 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -238,7 +238,7 @@ void proto_register_prp(void) */ proto_disable_by_default(proto_prp); - prp_module = prefs_register_protocol(proto_prp, NULL); + prp_module = prefs_register_protocol_obsolete(proto_prp); prefs_register_obsolete_preference(prp_module, "enable"); diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c index 1056de3a11..177e772c44 100644 --- a/epan/dissectors/packet-rpcrdma.c +++ b/epan/dissectors/packet-rpcrdma.c @@ -1837,7 +1837,7 @@ proto_register_rpcordma(void) reassembly_table_register(&rpcordma_reassembly_table, &addresses_ports_reassembly_table_functions); /* Register preferences */ - rpcordma_module = prefs_register_protocol(proto_rpcordma, proto_reg_handoff_rpcordma); + rpcordma_module = prefs_register_protocol_obsolete(proto_rpcordma); prefs_register_obsolete_preference(rpcordma_module, "manual_en"); prefs_register_obsolete_preference(rpcordma_module, "addr_a"); diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index 9daa54c32a..2a00f10c3e 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -271,7 +271,7 @@ proto_register_rtacser(void) proto_register_subtree_array(ett, array_length(ett)); /* Register required preferences for RTAC Serial Payload Protocol */ - rtacser_module = prefs_register_protocol(proto_rtacser, proto_reg_handoff_rtacser); + rtacser_module = prefs_register_protocol_obsolete(proto_rtacser); /* RTAC Serial Preference - Payload Protocol in use */ prefs_register_obsolete_preference(rtacser_module, "rtacserial_payload_proto"); diff --git a/epan/prefs.h b/epan/prefs.h index e0bb4365af..09ffc190ef 100644 --- a/epan/prefs.h +++ b/epan/prefs.h @@ -318,7 +318,7 @@ WS_DLL_PUBLIC module_t *prefs_register_protocol_subtree(const char *subtree, int * Register that a protocol used to have preferences but no longer does, * by creating an "obsolete" module for it. */ -module_t *prefs_register_protocol_obsolete(int id); +WS_DLL_PUBLIC module_t *prefs_register_protocol_obsolete(int id); /* * Callback function for module list scanners. diff --git a/plugins/epan/ethercat/packet-esl.c b/plugins/epan/ethercat/packet-esl.c index c13f2ca7f3..9b8ca0bd9b 100644 --- a/plugins/epan/ethercat/packet-esl.c +++ b/plugins/epan/ethercat/packet-esl.c @@ -336,7 +336,7 @@ proto_register_esl(void) { proto_esl = proto_register_protocol("EtherCAT Switch Link", "ESL","esl"); - esl_module = prefs_register_protocol(proto_esl, proto_reg_handoff_esl); + esl_module = prefs_register_protocol_obsolete(proto_esl); prefs_register_obsolete_preference(esl_module, "enable");