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 /epan/dissectors/packet-sdp.c | |
| 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 'epan/dissectors/packet-sdp.c')
| -rw-r--r-- | epan/dissectors/packet-sdp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c index 34b5a1e8c2..ba08f5c592 100644 --- a/epan/dissectors/packet-sdp.c +++ b/epan/dissectors/packet-sdp.c @@ -77,7 +77,6 @@ static dissector_handle_t rtp_handle; static dissector_handle_t rtcp_handle; -static dissector_handle_t t38_handle; static dissector_handle_t sprt_handle; static dissector_handle_t msrp_handle; static dissector_handle_t h264_handle; @@ -1886,8 +1885,7 @@ setup_sdp_transport(tvbuff_t *tvb, packet_info *pinfo, enum sdp_exchange_type ex if ((transport_info->media_port[n] != 0) && !transport_info->media[n].set_rtp && (transport_info->proto_bitmask[n] & SDP_T38_PROTO) && - (transport_info->proto_bitmask[n] & SDP_IPv4) && - t38_handle) { + (transport_info->proto_bitmask[n] & SDP_IPv4)) { t38_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num); } @@ -2231,8 +2229,7 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (transport_info->media_port[n] != 0) && !transport_info->media[n].set_rtp && (transport_info->proto_bitmask[n] & SDP_T38_PROTO) && - (transport_info->proto_bitmask[n] & SDP_IPv4) && - t38_handle) { + (transport_info->proto_bitmask[n] & SDP_IPv4)) { t38_add_address(pinfo, &transport_info->src_addr[n], transport_info->media_port[n], 0, "SDP", pinfo->fd->num); } @@ -2740,7 +2737,6 @@ proto_reg_handoff_sdp(void) rtp_handle = find_dissector("rtp"); rtcp_handle = find_dissector("rtcp"); msrp_handle = find_dissector("msrp"); - t38_handle = find_dissector("t38"); sprt_handle = find_dissector("sprt"); h264_handle = find_dissector("h264"); mp4ves_handle = find_dissector("mp4ves"); |