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

prefs_register_protocol_obsolete protocols with only obsolete prefs 

Related to #17465 and !3526
This commit is contained in:
Chuck Craft 2021-07-11 11:42:42 -05:00 committed by Wireshark GitLab Utility
parent 175d75aa03
commit a7d927a9e9
12 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/libwireshark0.symbols vendored
View File

@ -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

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

@ -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");
}
}

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

@ -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");
}

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

@ -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");

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

@ -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));

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

@ -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);

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

@ -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");

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

@ -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");

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

@ -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");

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

@ -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");

2
epan/prefs.h
View File

@ -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.

2
plugins/epan/ethercat/packet-esl.c
View File

@ -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");