diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-11-05 09:30:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-11-05 09:30:11 +0000 |
| commit | 9bae9707d37212e81010976957d3f0fce7e7e037 (patch) | |
| tree | 993708af4bd68a7453e64eb2ba582bded54c7d29 /packet-rtcp.c | |
| parent | 45fd4fec54c327c82e690bedf874c03a28512c92 (diff) | |
| download | wireshark-9bae9707d37212e81010976957d3f0fce7e7e037.tar.gz wireshark-9bae9707d37212e81010976957d3f0fce7e7e037.tar.bz2 wireshark-9bae9707d37212e81010976957d3f0fce7e7e037.zip | |
Make the RTCP, RTP, WSP, and WTP dissectors check whether their
protocols have been disabled.
Get rid of the "no tvbuff" dissectors for WSP and WTP - they're not used
(and shouldn't ever be used).
Make "dissect_wtp()" static, as it's not used outside "packet-wtp.c".
svn path=/trunk/; revision=2568
Diffstat (limited to 'packet-rtcp.c')
| -rw-r--r-- | packet-rtcp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packet-rtcp.c b/packet-rtcp.c index 5096caa3d6..4774282db4 100644 --- a/packet-rtcp.c +++ b/packet-rtcp.c @@ -234,12 +234,16 @@ static void rtcp_init( void ) gboolean dissect_rtcp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { + conversation_t* pconv; + + if (!proto_is_protocol_enabled(proto_rtcp)) + return FALSE; /* RTCP has been disabled */ + /* This is a heuristic dissector, which means we get all the UDP * traffic not sent to a known dissector and not claimed by * a heuristic dissector called before us! * So we first check if the frame is really meant for us. */ - conversation_t* pconv; if ( ( pconv = find_conversation( &pi.src, &fake_addr, pi.ptype, pi.srcport, 0, 0 ) ) == NULL ) { /* @@ -624,6 +628,8 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) unsigned int offset = 0; guint16 packet_length = 0; + CHECK_DISPLAY_AS_DATA(proto_rtcp, tvb, pinfo, tree); + pinfo->current_proto = "RTCP"; if ( check_col( pinfo->fd, COL_PROTOCOL ) ) { |