diff options
author | Michael Mann <mmann78@netscape.net> | 2013-11-12 21:10:20 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-11-12 21:10:20 +0000 |
commit | a661864f4866a7af9ed3ed23998b0a3a4e2579d3 (patch) | |
tree | 376641ceda920897757108c985a9c8506c3ac105 /asn1 | |
parent | f56aa721572ded43801a5abff2a97db226b23634 (diff) |
Add "T.38 handle protection" inside t38_add_address() so dissectors calling it don't need to find "t38" just for the handle check.
svn path=/trunk/; revision=53283
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/h245/packet-h245-template.c | 4 | ||||
-rw-r--r-- | asn1/t38/packet-t38-template.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index 904b080724..e69c4d91d8 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -62,7 +62,6 @@ static dissector_handle_t rtp_handle=NULL; static dissector_handle_t rtcp_handle=NULL; -static dissector_handle_t t38_handle=NULL; static dissector_table_t nsp_object_dissector_table; static dissector_table_t nsp_h221_dissector_table; static dissector_table_t gef_name_dissector_table; @@ -346,7 +345,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha /* T.38 */ if (!strcmp(upcoming_channel_lcl->data_type_str, "t38fax")) { - if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0 && t38_handle) { + if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0) { t38_add_address(pinfo, &upcoming_channel_lcl->media_addr.addr, upcoming_channel_lcl->media_addr.port, 0, "H245", pinfo->fd->num); @@ -579,7 +578,6 @@ void proto_reg_handoff_h245(void) { rtp_handle = find_dissector("rtp"); rtcp_handle = find_dissector("rtcp"); - t38_handle = find_dissector("t38"); data_handle = find_dissector("data"); h263_handle = find_dissector("h263data"); amr_handle = find_dissector("amr_if2_nb"); diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 48e03d7c52..22ce949104 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -227,7 +227,7 @@ void t38_add_address(packet_info *pinfo, * we've already done this work, so we don't need to do it * again. */ - if (pinfo->fd->flags.visited) + if ((pinfo->fd->flags.visited) || (t38_udp_handle == NULL)) { return; } |