diff options
author | Michael Mann <mmann78@netscape.net> | 2013-11-12 22:04:03 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-11-12 22:04:03 +0000 |
commit | 7221215cdca74a587615e4e1ab9d79540bf58043 (patch) | |
tree | 89c8a8c9deae381fa127f3d18003f15b64d07e1e /epan/dissectors/packet-ansi_a.c | |
parent | 99f0fc1d27a64efe3dcaf6e012cf8dd5940a71be (diff) |
Add "rtp handle protection" inside srtp_add_address/rtp_add_address/bluetooth_add_address so dissectors calling it don't need to find "rtp" just for the handle check.
svn path=/trunk/; revision=53288
Diffstat (limited to 'epan/dissectors/packet-ansi_a.c')
-rw-r--r-- | epan/dissectors/packet-ansi_a.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c index 3841b57278..379e90e0be 100644 --- a/epan/dissectors/packet-ansi_a.c +++ b/epan/dissectors/packet-ansi_a.c @@ -720,7 +720,6 @@ static gint ett_vp_algs = -1; static expert_field ei_ansi_a_extraneous_data = EI_INIT; static char a_bigbuf[1024]; -static dissector_handle_t rtp_handle=NULL; static dissector_handle_t data_handle; static dissector_handle_t dtap_handle; static dissector_table_t is637_dissector_table; /* IS-637-A Transport Layer (SMS) */ @@ -8419,8 +8418,7 @@ elem_a2p_bearer_format(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item_set_len(item, curr_offset - orig_offset); - if (rtp_handle && - format_assigned && + if (format_assigned && (first_assigned_found == FALSE)) { key = wmem_new(wmem_file_scope(), gint); @@ -12413,7 +12411,6 @@ proto_reg_handoff_ansi_a(void) dtap_handle = create_dissector_handle(dissect_dtap, proto_a_dtap); sip_dtap_bsmap_handle = create_dissector_handle(dissect_sip_dtap_bsmap, proto_a_dtap); data_handle = find_dissector("data"); - rtp_handle = find_dissector("rtp"); dissector_add_uint("bsap.pdu_type", BSSAP_PDU_TYPE_BSMAP, bsmap_handle); dissector_add_uint("bsap.pdu_type", BSSAP_PDU_TYPE_DTAP, dtap_handle); |