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 /asn1/h245/packet-h245-template.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 'asn1/h245/packet-h245-template.c')
| -rw-r--r-- | asn1/h245/packet-h245-template.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index e69c4d91d8..e791a4f007 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -60,7 +60,7 @@ #define PSNAME "H.245" #define PFNAME "h245" -static dissector_handle_t rtp_handle=NULL; + static dissector_handle_t rtcp_handle=NULL; static dissector_table_t nsp_object_dissector_table; static dissector_table_t nsp_h221_dissector_table; @@ -370,7 +370,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha /* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel_lcl->media_addr.addr.type, upcoming_channel_lcl->media_addr.port ); */ - if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0 && rtp_handle) { + if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0) { srtp_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr, upcoming_channel_lcl->media_addr.port, 0, "H245", pinfo->fd->num, upcoming_channel_lcl->is_video , rtp_dyn_payload, dummy_srtp_info); @@ -576,7 +576,6 @@ void proto_register_h245(void) { void proto_reg_handoff_h245(void) { dissector_handle_t h245_handle; - rtp_handle = find_dissector("rtp"); rtcp_handle = find_dissector("rtcp"); data_handle = find_dissector("data"); h263_handle = find_dissector("h263data"); |