diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-06-30 20:41:45 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-07-01 14:26:20 +0000 |
| commit | a062c802364fd83d43f934560149f2ddd1fee6a3 (patch) | |
| tree | e5c9240b24a5b86c12b4a9481a2bd93e18b828f5 /epan/dissectors/asn1/gsm_map | |
| parent | d4add25cb77773d9564dfc8f340ab5ce491a7d20 (diff) | |
| download | wireshark-a062c802364fd83d43f934560149f2ddd1fee6a3.tar.gz | |
ASN.1 dissectors - don't try to find yourself.
If an ASN.1 dissector is calling register_dissector for itself in its proto_register_xxx
function and then calling find_dissector for itself in its proto_reg_handoff_xxx
function then just create a static handle for that dissector and use the return
value of register_dissector, so the find isn't necessary.
Change-Id: I911bdadc2fb4259601c141b955e741a2369cc447
Reviewed-on: https://code.wireshark.org/review/16233
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/gsm_map')
| -rw-r--r-- | epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c index e36db21b2e..ff2a9a708e 100644 --- a/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c +++ b/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.c @@ -2636,7 +2636,6 @@ void proto_reg_handoff_gsm_map(void) { gsm_sms_handle = find_dissector_add_dependency("gsm_sms", proto_gsm_map); bssap_handle = find_dissector_add_dependency("gsm_a_bssmap", proto_gsm_map); - map_handle = find_dissector("gsm_map"); oid_add_from_string("itu(0) administration(2) japan(440)","0.2.440" ); register_ber_oid_dissector_handle("0.4.0.0.1.0.1.3", map_handle, proto_gsm_map,"networkLocUpContext-v3"); register_ber_oid_dissector_handle("0.4.0.0.1.0.1.2", map_handle, proto_gsm_map,"networkLocUpContext-v2" ); @@ -3127,7 +3126,7 @@ void proto_register_gsm_map(void) { /* Register protocol */ proto_gsm_map_ms = proto_gsm_map_dialogue = proto_gsm_map = proto_register_protocol(PNAME, PSNAME, PFNAME); - register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map); + map_handle = register_dissector("gsm_map", dissect_gsm_map, proto_gsm_map); register_dissector("gsm_map_sccp", dissect_gsm_map_sccp, proto_gsm_map); /* Register fields and subtrees */ |