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-wtp.c | |
| parent | 45fd4fec54c327c82e690bedf874c03a28512c92 (diff) | |
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-wtp.c')
| -rw-r--r-- | packet-wtp.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/packet-wtp.c b/packet-wtp.c index 4f9e2df88d..eab342b6be 100644 --- a/packet-wtp.c +++ b/packet-wtp.c @@ -3,7 +3,7 @@ * * Routines to dissect WTP component of WAP traffic. * - * $Id: packet-wtp.c,v 1.2 2000/11/04 07:38:19 guy Exp $ + * $Id: packet-wtp.c,v 1.3 2000/11/05 09:30:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -166,18 +166,9 @@ static gint ett_header = ETT_EMPTY; static char transaction_class(unsigned char octet); static char pdu_type(unsigned char octet); static char retransmission_indicator(unsigned char octet); -void dissect_wtp(tvbuff_t *, packet_info *, proto_tree *); - -void -dissect_wtp_no_tvbuff(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) -{ - packet_info *pinfo = π - tvbuff_t *tvb = tvb_create_from_top(offset); - dissect_wtp (tvb, pinfo, tree); -} /* Code to actually dissect the packets */ -void +static void dissect_wtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { frame_data *fdata = pinfo->fd; @@ -210,6 +201,8 @@ dissect_wtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int i; tvbuff_t *wsp_tvb = NULL; + CHECK_DISPLAY_AS_DATA(proto_wtp, tvb, pinfo, tree); + /* Make entries in Protocol column and Info column of summary display */ #ifdef DEBUG |