diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-12-20 20:13:28 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-12-21 04:14:24 +0000 |
| commit | 2b006ad30e38b015cfd13c33b265e2f48ddf36b2 (patch) | |
| tree | c3c9a0de47a59d414477143a7ad24be694f28672 /asn1 | |
| parent | 81798009b97549ad0879d1c01a3b9c60ed726ed9 (diff) | |
Have a heur_dissector_list_t be an opaque handle.
This allows dissector lists to be looked up by name, so they can be
shared by multiple dissectors.
(This means that there's no "udplite" heuristic dissector list, but
there shouldn't be one - protocols can run atop UDP or UDPLite equally
well, and they share a port namespace and uint dissector table, so they
should share a heuristic dissector table as well.)
Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7
Reviewed-on: https://code.wireshark.org/review/5936
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/atn-ulcs/packet-atn-ulcs-template.c | 4 | ||||
| -rw-r--r-- | asn1/credssp/packet-credssp-template.c | 2 | ||||
| -rw-r--r-- | asn1/mpeg-pes/packet-mpeg-pes-template.c | 2 | ||||
| -rw-r--r-- | asn1/t125/packet-t125-template.c | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/asn1/atn-ulcs/packet-atn-ulcs-template.c b/asn1/atn-ulcs/packet-atn-ulcs-template.c index c5af4a642b..578f7ae240 100644 --- a/asn1/atn-ulcs/packet-atn-ulcs-template.c +++ b/asn1/atn-ulcs/packet-atn-ulcs-template.c @@ -880,9 +880,7 @@ void proto_register_atn_ulcs (void) atn_cpdlc_handle = find_dissector("atn-cpdlc"); /* initiate sub dissector list */ - register_heur_dissector_list( - "atn-ulcs", - &atn_ulcs_heur_subdissector_list); + atn_ulcs_heur_subdissector_list = register_heur_dissector_list("atn-ulcs"); /* init aare/aare data */ aarq_data_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); diff --git a/asn1/credssp/packet-credssp-template.c b/asn1/credssp/packet-credssp-template.c index 63ed931ddb..989e4d0d67 100644 --- a/asn1/credssp/packet-credssp-template.c +++ b/asn1/credssp/packet-credssp-template.c @@ -169,7 +169,7 @@ void proto_register_credssp(void) { proto_register_subtree_array(ett, array_length(ett)); /* heuristic dissectors for any premable e.g. CredSSP before RDP */ - register_heur_dissector_list("credssp", &credssp_heur_subdissector_list); + credssp_heur_subdissector_list = register_heur_dissector_list("credssp"); } diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index 7035d7886f..b3236543fa 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -661,7 +661,7 @@ proto_register_mpeg_pes(void) proto_mpeg = proto_register_protocol( "Moving Picture Experts Group", "MPEG", "mpeg"); register_dissector("mpeg", dissect_mpeg, proto_mpeg); - register_heur_dissector_list("mpeg", &heur_subdissector_list); + heur_subdissector_list = register_heur_dissector_list("mpeg"); proto_mpeg_pes = proto_register_protocol( "Packetized Elementary Stream", "MPEG PES", "mpeg-pes"); diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index cc13f88a0a..209b811e95 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -138,7 +138,7 @@ void proto_register_t125(void) { proto_register_field_array(proto_t125, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - register_heur_dissector_list("t125", &t125_heur_subdissector_list); + t125_heur_subdissector_list= register_heur_dissector_list("t125"); new_register_dissector("t125", dissect_t125, proto_t125); } |