2000-11-04 03:30:41 +00:00
|
|
|
/* packet-wtp.c (c) 2000 Neil Hunter
|
|
|
|
|
* Base on original work by Ben Fowler
|
|
|
|
|
*
|
|
|
|
|
* Routines to dissect WTP component of WAP traffic.
|
|
|
|
|
*
|
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Don't use
col_add_fstr(..., "%s", string);
Use
col_add_str(..., string);
as it does the same thing, but doesn't drag all the heavy *printf
machinery in.
Fix the DDTP dissector to set the Info column regardless of whether
we're building a protocol tree or not, and to set it to "Encrypted
payload" if the payload is encrypted. Also fix a typo in a field name.
Register the FTP data dissector as being associated with the FTP data
protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()"
call checked "proto_ftp_data", and the removed "pinfo->current_proto ="
line set it to "FTP-DATA", so it should be associated with
"proto_ftp_data").
Make the H1 dissector check whether the frame has at least 2 bytes in it
before checking the first two bytes; heuristic dissectors must not throw
exceptions until they've accepted the packet as one of theirs.
Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()"
in some dissectors where the result of "tvb_get_ptr()" is used only in
the "format_text()" call.
In the Quake dissector, don't check whether there are at least 4 bytes
in the packet - if we return, the packet won't be dissected at all (it's
not as if some other dissector will get to handle it), and, if we don't
return, we'll throw an exception if there aren't at least 4 bytes in the
packet, so the packet will be marked as short or malformed, as
appropriate.
In the RIPng dissector, associate the table of strings for the command
field with the command field, so that the dissector doesn't have to
format the string for the protocol tree entry itself, and so that the
filter construction dialog box can let you select "Request" or
"Response" from a list rather than requiring you to know the values for
"Request" and "Response".
Make "dissect_rpc()" static, as it's called only through a heuristic
dissector list.
Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols;
the string used is from a table provided by the dissector, and is a
string constant.
Don't format the Info column for WSP into a buffer and then format that
buffer into the column with "%s" - "col_add_fstr()" can do the
formatting for you, without having to allocate your own buffer (or run
through the *printf machinery twice).
Don't fetch fields from the WTP packet until you're ready to use them,
so that you don't throw an exception before you even set the Protocol
column or clear the Info column.
Use "pinfo->destport", not "pi.destport", in the Zebra dissector when
checking whether the packet is a request or reply, and do the check by
comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that
if the dissector is ever registered on another port, it still correctly
determines whether the packet is a request or reply - the Network
Monitor HTTP dissector has port 80 wired into its brain, which is a bit
irritating if you're trying to get it to dissect HTTP proxy traffic on
port 3128 or proxy administration UI traffic on port 3132).
svn path=/trunk/; revision=2931
2001-01-22 08:03:46 +00:00
|
|
|
* $Id: packet-wtp.c,v 1.10 2001/01/22 08:03:46 guy Exp $
|
2000-11-04 03:30:41 +00:00
|
|
|
*
|
|
|
|
|
* Ethereal - Network traffic analyzer
|
|
|
|
|
* By Gerald Combs <gerald@zing.org>
|
|
|
|
|
* Copyright 1998 Didier Jorand
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
# include "config.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
|
# include <sys/types.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
|
|
|
# include <netinet/in.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef NEED_SNPRINTF_H
|
|
|
|
|
# ifdef HAVE_STDARG_H
|
|
|
|
|
# include <stdarg.h>
|
|
|
|
|
# else
|
|
|
|
|
# include <varargs.h>
|
|
|
|
|
# endif
|
|
|
|
|
# include "snprintf.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
#include "packet.h"
|
|
|
|
|
#include "packet-wap.h"
|
|
|
|
|
#include "packet-wtp.h"
|
|
|
|
|
#include "packet-wsp.h"
|
|
|
|
|
|
|
|
|
|
static const true_false_string continue_truth = {
|
|
|
|
|
"TPI Present" ,
|
|
|
|
|
"No TPI"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const true_false_string RID_truth = {
|
|
|
|
|
"Re-Transmission",
|
|
|
|
|
"First transmission"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const true_false_string TIDNew_truth = {
|
|
|
|
|
"TID is new" ,
|
|
|
|
|
"TID is valid"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const true_false_string tid_response_truth = {
|
|
|
|
|
"Response" ,
|
|
|
|
|
"Original"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const true_false_string UP_truth = {
|
|
|
|
|
"User Acknowledgement required" ,
|
|
|
|
|
"User Acknowledgement optional"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const true_false_string TVETOK_truth = {
|
|
|
|
|
"True",
|
|
|
|
|
"False"
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const value_string vals_pdu_type[] = {
|
|
|
|
|
{ 0, "Not Allowed" },
|
|
|
|
|
{ 1, "Invoke" },
|
|
|
|
|
{ 2, "Result" },
|
|
|
|
|
{ 3, "Ack" },
|
|
|
|
|
{ 4, "Abort" },
|
|
|
|
|
{ 5, "Segmented Invoke" },
|
|
|
|
|
{ 6, "Segmented Result" },
|
2001-01-03 16:41:08 +00:00
|
|
|
{ 7, "Negative Ack" },
|
|
|
|
|
{ 0, NULL }
|
2000-11-04 03:30:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const value_string vals_transmission_trailer[] = {
|
|
|
|
|
{ 0, "Not last packet" },
|
|
|
|
|
{ 1, "Last packet of message" },
|
|
|
|
|
{ 2, "Last packet of group" },
|
|
|
|
|
{ 3, "Re-assembly not supported" },
|
2001-01-03 16:41:08 +00:00
|
|
|
{ 0, NULL }
|
2000-11-04 03:30:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const value_string vals_version[] = {
|
|
|
|
|
{ 0, "Current" },
|
|
|
|
|
{ 1, "Undefined" },
|
|
|
|
|
{ 2, "Undefined" },
|
|
|
|
|
{ 3, "Undefined" },
|
2001-01-03 16:41:08 +00:00
|
|
|
{ 0, NULL }
|
2000-11-04 03:30:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const value_string vals_abort_type[] = {
|
|
|
|
|
{ 0, "Provider" },
|
2001-01-03 16:41:08 +00:00
|
|
|
{ 1, "User (WSP)" },
|
|
|
|
|
{ 0, NULL }
|
2000-11-04 03:30:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const value_string vals_abort_reason_provider[] = {
|
|
|
|
|
{ 0x00, "Unknown" },
|
|
|
|
|
{ 0x01, "Protocol Error" },
|
|
|
|
|
{ 0x02, "Invalid TID" },
|
|
|
|
|
{ 0x03, "Not Implemented Class 2" },
|
|
|
|
|
{ 0x04, "Not Implemented SAR" },
|
|
|
|
|
{ 0x05, "Not Implemented User Acknowledgement" },
|
|
|
|
|
{ 0x06, "WTP Version Zero" },
|
|
|
|
|
{ 0x07, "Capacity Temporarily Exceeded" },
|
|
|
|
|
{ 0x08, "No Response" },
|
2001-01-03 16:41:08 +00:00
|
|
|
{ 0x09, "Message Too Large" },
|
|
|
|
|
{ 0x00, NULL }
|
2000-11-04 03:30:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* File scoped variables for the protocol and registered fields */
|
|
|
|
|
static int proto_wtp = HF_EMPTY;
|
|
|
|
|
|
|
|
|
|
/* These fields used by fixed part of header */
|
|
|
|
|
static int hf_wtp_header_fixed_part = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_flag_continue = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_pdu_type = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_flag_Trailer = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_flag_RID = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_flag_TID = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_flag_TID_response = HF_EMPTY;
|
|
|
|
|
|
|
|
|
|
/* These fields used by Invoke packets */
|
|
|
|
|
static int hf_wtp_header_Inv_version = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_Inv_flag_TIDNew = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_Inv_flag_UP = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_Inv_Reserved = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_Inv_TransactionClass = HF_EMPTY;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int hf_wtp_header_variable_part = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_data = HF_EMPTY;
|
|
|
|
|
|
|
|
|
|
static int hf_wtp_header_Ack_flag_TVETOK = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_Abort_type = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_Abort_reason_provider = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_Abort_reason_user = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_sequence_number = HF_EMPTY;
|
|
|
|
|
static int hf_wtp_header_missing_packets = HF_EMPTY;
|
|
|
|
|
|
|
|
|
|
/* Initialize the subtree pointers */
|
|
|
|
|
static gint ett_wtp = ETT_EMPTY;
|
|
|
|
|
static gint ett_header = ETT_EMPTY;
|
|
|
|
|
|
2001-01-03 08:42:48 +00:00
|
|
|
static dissector_handle_t wsp_handle;
|
|
|
|
|
|
2000-11-04 03:30:41 +00:00
|
|
|
/* Declarations */
|
|
|
|
|
static char transaction_class(unsigned char octet);
|
|
|
|
|
static char pdu_type(unsigned char octet);
|
|
|
|
|
static char retransmission_indicator(unsigned char octet);
|
|
|
|
|
|
|
|
|
|
/* Code to actually dissect the packets */
|
2000-11-05 09:30:11 +00:00
|
|
|
static void
|
2000-11-04 03:30:41 +00:00
|
|
|
dissect_wtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
|
{
|
|
|
|
|
frame_data *fdata = pinfo->fd;
|
|
|
|
|
|
|
|
|
|
char szInfo[ 50 ];
|
|
|
|
|
int offCur = 0; /* current offset from start of WTP data */
|
|
|
|
|
|
|
|
|
|
/* bytes at offset 0 - 3 */
|
|
|
|
|
/*
|
|
|
|
|
unsigned char b0 = pd[offset + 0];
|
|
|
|
|
unsigned char b3 = pd[offset + 3];
|
|
|
|
|
*/
|
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Don't use
col_add_fstr(..., "%s", string);
Use
col_add_str(..., string);
as it does the same thing, but doesn't drag all the heavy *printf
machinery in.
Fix the DDTP dissector to set the Info column regardless of whether
we're building a protocol tree or not, and to set it to "Encrypted
payload" if the payload is encrypted. Also fix a typo in a field name.
Register the FTP data dissector as being associated with the FTP data
protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()"
call checked "proto_ftp_data", and the removed "pinfo->current_proto ="
line set it to "FTP-DATA", so it should be associated with
"proto_ftp_data").
Make the H1 dissector check whether the frame has at least 2 bytes in it
before checking the first two bytes; heuristic dissectors must not throw
exceptions until they've accepted the packet as one of theirs.
Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()"
in some dissectors where the result of "tvb_get_ptr()" is used only in
the "format_text()" call.
In the Quake dissector, don't check whether there are at least 4 bytes
in the packet - if we return, the packet won't be dissected at all (it's
not as if some other dissector will get to handle it), and, if we don't
return, we'll throw an exception if there aren't at least 4 bytes in the
packet, so the packet will be marked as short or malformed, as
appropriate.
In the RIPng dissector, associate the table of strings for the command
field with the command field, so that the dissector doesn't have to
format the string for the protocol tree entry itself, and so that the
filter construction dialog box can let you select "Request" or
"Response" from a list rather than requiring you to know the values for
"Request" and "Response".
Make "dissect_rpc()" static, as it's called only through a heuristic
dissector list.
Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols;
the string used is from a table provided by the dissector, and is a
string constant.
Don't format the Info column for WSP into a buffer and then format that
buffer into the column with "%s" - "col_add_fstr()" can do the
formatting for you, without having to allocate your own buffer (or run
through the *printf machinery twice).
Don't fetch fields from the WTP packet until you're ready to use them,
so that you don't throw an exception before you even set the Protocol
column or clear the Info column.
Use "pinfo->destport", not "pi.destport", in the Zebra dissector when
checking whether the packet is a request or reply, and do the check by
comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that
if the dissector is ever registered on another port, it still correctly
determines whether the packet is a request or reply - the Network
Monitor HTTP dissector has port 80 wired into its brain, which is a bit
irritating if you're trying to get it to dissect HTTP proxy traffic on
port 3128 or proxy administration UI traffic on port 3132).
svn path=/trunk/; revision=2931
2001-01-22 08:03:46 +00:00
|
|
|
unsigned char b0;
|
2000-11-04 03:30:41 +00:00
|
|
|
|
|
|
|
|
/* continuation flag */
|
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Don't use
col_add_fstr(..., "%s", string);
Use
col_add_str(..., string);
as it does the same thing, but doesn't drag all the heavy *printf
machinery in.
Fix the DDTP dissector to set the Info column regardless of whether
we're building a protocol tree or not, and to set it to "Encrypted
payload" if the payload is encrypted. Also fix a typo in a field name.
Register the FTP data dissector as being associated with the FTP data
protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()"
call checked "proto_ftp_data", and the removed "pinfo->current_proto ="
line set it to "FTP-DATA", so it should be associated with
"proto_ftp_data").
Make the H1 dissector check whether the frame has at least 2 bytes in it
before checking the first two bytes; heuristic dissectors must not throw
exceptions until they've accepted the packet as one of theirs.
Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()"
in some dissectors where the result of "tvb_get_ptr()" is used only in
the "format_text()" call.
In the Quake dissector, don't check whether there are at least 4 bytes
in the packet - if we return, the packet won't be dissected at all (it's
not as if some other dissector will get to handle it), and, if we don't
return, we'll throw an exception if there aren't at least 4 bytes in the
packet, so the packet will be marked as short or malformed, as
appropriate.
In the RIPng dissector, associate the table of strings for the command
field with the command field, so that the dissector doesn't have to
format the string for the protocol tree entry itself, and so that the
filter construction dialog box can let you select "Request" or
"Response" from a list rather than requiring you to know the values for
"Request" and "Response".
Make "dissect_rpc()" static, as it's called only through a heuristic
dissector list.
Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols;
the string used is from a table provided by the dissector, and is a
string constant.
Don't format the Info column for WSP into a buffer and then format that
buffer into the column with "%s" - "col_add_fstr()" can do the
formatting for you, without having to allocate your own buffer (or run
through the *printf machinery twice).
Don't fetch fields from the WTP packet until you're ready to use them,
so that you don't throw an exception before you even set the Protocol
column or clear the Info column.
Use "pinfo->destport", not "pi.destport", in the Zebra dissector when
checking whether the packet is a request or reply, and do the check by
comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that
if the dissector is ever registered on another port, it still correctly
determines whether the packet is a request or reply - the Network
Monitor HTTP dissector has port 80 wired into its brain, which is a bit
irritating if you're trying to get it to dissect HTTP proxy traffic on
port 3128 or proxy administration UI traffic on port 3132).
svn path=/trunk/; revision=2931
2001-01-22 08:03:46 +00:00
|
|
|
unsigned char fCon;
|
|
|
|
|
unsigned char fRID;
|
2000-11-04 03:30:41 +00:00
|
|
|
int cbHeader = 0;
|
|
|
|
|
int abortType = 0;
|
|
|
|
|
|
|
|
|
|
/* Set up structures we will need to add the protocol subtree and manage it */
|
|
|
|
|
proto_item *ti;
|
|
|
|
|
proto_tree *wtp_tree;
|
|
|
|
|
proto_tree *wtp_header_fixed;
|
|
|
|
|
|
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Don't use
col_add_fstr(..., "%s", string);
Use
col_add_str(..., string);
as it does the same thing, but doesn't drag all the heavy *printf
machinery in.
Fix the DDTP dissector to set the Info column regardless of whether
we're building a protocol tree or not, and to set it to "Encrypted
payload" if the payload is encrypted. Also fix a typo in a field name.
Register the FTP data dissector as being associated with the FTP data
protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()"
call checked "proto_ftp_data", and the removed "pinfo->current_proto ="
line set it to "FTP-DATA", so it should be associated with
"proto_ftp_data").
Make the H1 dissector check whether the frame has at least 2 bytes in it
before checking the first two bytes; heuristic dissectors must not throw
exceptions until they've accepted the packet as one of theirs.
Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()"
in some dissectors where the result of "tvb_get_ptr()" is used only in
the "format_text()" call.
In the Quake dissector, don't check whether there are at least 4 bytes
in the packet - if we return, the packet won't be dissected at all (it's
not as if some other dissector will get to handle it), and, if we don't
return, we'll throw an exception if there aren't at least 4 bytes in the
packet, so the packet will be marked as short or malformed, as
appropriate.
In the RIPng dissector, associate the table of strings for the command
field with the command field, so that the dissector doesn't have to
format the string for the protocol tree entry itself, and so that the
filter construction dialog box can let you select "Request" or
"Response" from a list rather than requiring you to know the values for
"Request" and "Response".
Make "dissect_rpc()" static, as it's called only through a heuristic
dissector list.
Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols;
the string used is from a table provided by the dissector, and is a
string constant.
Don't format the Info column for WSP into a buffer and then format that
buffer into the column with "%s" - "col_add_fstr()" can do the
formatting for you, without having to allocate your own buffer (or run
through the *printf machinery twice).
Don't fetch fields from the WTP packet until you're ready to use them,
so that you don't throw an exception before you even set the Protocol
column or clear the Info column.
Use "pinfo->destport", not "pi.destport", in the Zebra dissector when
checking whether the packet is a request or reply, and do the check by
comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that
if the dissector is ever registered on another port, it still correctly
determines whether the packet is a request or reply - the Network
Monitor HTTP dissector has port 80 wired into its brain, which is a bit
irritating if you're trying to get it to dissect HTTP proxy traffic on
port 3128 or proxy administration UI traffic on port 3132).
svn path=/trunk/; revision=2931
2001-01-22 08:03:46 +00:00
|
|
|
char pdut;
|
2000-11-04 03:30:41 +00:00
|
|
|
char clsTransaction = ' ';
|
|
|
|
|
int cchInfo;
|
|
|
|
|
int numMissing = 0; /* Number of missing packets in a negative ack */
|
|
|
|
|
int i;
|
|
|
|
|
tvbuff_t *wsp_tvb = NULL;
|
|
|
|
|
|
|
|
|
|
/* Make entries in Protocol column and Info column of summary display */
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: (Entering) Frame data at %p\n", fdata );
|
|
|
|
|
fprintf( stderr, "dissect_wtp: tvb length is %d\n", tvb_reported_length( tvb ) );
|
|
|
|
|
#endif
|
|
|
|
|
/* Display protocol type depending on the port */
|
|
|
|
|
if (check_col(fdata, COL_PROTOCOL))
|
|
|
|
|
{
|
|
|
|
|
switch ( pinfo->match_port )
|
|
|
|
|
{
|
|
|
|
|
case UDP_PORT_WTP_WSP:
|
|
|
|
|
col_add_fstr(fdata, COL_PROTOCOL, "WTP+WSP" );
|
|
|
|
|
break;
|
|
|
|
|
case UDP_PORT_WTLS_WTP_WSP:
|
|
|
|
|
col_add_fstr(fdata, COL_PROTOCOL, "WTLS+WTP+WSP" );
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2000-11-04 07:38:19 +00:00
|
|
|
break;
|
2000-11-04 03:30:41 +00:00
|
|
|
}
|
|
|
|
|
}
|
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Don't use
col_add_fstr(..., "%s", string);
Use
col_add_str(..., string);
as it does the same thing, but doesn't drag all the heavy *printf
machinery in.
Fix the DDTP dissector to set the Info column regardless of whether
we're building a protocol tree or not, and to set it to "Encrypted
payload" if the payload is encrypted. Also fix a typo in a field name.
Register the FTP data dissector as being associated with the FTP data
protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()"
call checked "proto_ftp_data", and the removed "pinfo->current_proto ="
line set it to "FTP-DATA", so it should be associated with
"proto_ftp_data").
Make the H1 dissector check whether the frame has at least 2 bytes in it
before checking the first two bytes; heuristic dissectors must not throw
exceptions until they've accepted the packet as one of theirs.
Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()"
in some dissectors where the result of "tvb_get_ptr()" is used only in
the "format_text()" call.
In the Quake dissector, don't check whether there are at least 4 bytes
in the packet - if we return, the packet won't be dissected at all (it's
not as if some other dissector will get to handle it), and, if we don't
return, we'll throw an exception if there aren't at least 4 bytes in the
packet, so the packet will be marked as short or malformed, as
appropriate.
In the RIPng dissector, associate the table of strings for the command
field with the command field, so that the dissector doesn't have to
format the string for the protocol tree entry itself, and so that the
filter construction dialog box can let you select "Request" or
"Response" from a list rather than requiring you to know the values for
"Request" and "Response".
Make "dissect_rpc()" static, as it's called only through a heuristic
dissector list.
Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols;
the string used is from a table provided by the dissector, and is a
string constant.
Don't format the Info column for WSP into a buffer and then format that
buffer into the column with "%s" - "col_add_fstr()" can do the
formatting for you, without having to allocate your own buffer (or run
through the *printf machinery twice).
Don't fetch fields from the WTP packet until you're ready to use them,
so that you don't throw an exception before you even set the Protocol
column or clear the Info column.
Use "pinfo->destport", not "pi.destport", in the Zebra dissector when
checking whether the packet is a request or reply, and do the check by
comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that
if the dissector is ever registered on another port, it still correctly
determines whether the packet is a request or reply - the Network
Monitor HTTP dissector has port 80 wired into its brain, which is a bit
irritating if you're trying to get it to dissect HTTP proxy traffic on
port 3128 or proxy administration UI traffic on port 3132).
svn path=/trunk/; revision=2931
2001-01-22 08:03:46 +00:00
|
|
|
if (check_col(fdata, COL_INFO)) {
|
|
|
|
|
col_clear(fdata, COL_INFO);
|
|
|
|
|
};
|
2000-11-04 03:30:41 +00:00
|
|
|
|
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Don't use
col_add_fstr(..., "%s", string);
Use
col_add_str(..., string);
as it does the same thing, but doesn't drag all the heavy *printf
machinery in.
Fix the DDTP dissector to set the Info column regardless of whether
we're building a protocol tree or not, and to set it to "Encrypted
payload" if the payload is encrypted. Also fix a typo in a field name.
Register the FTP data dissector as being associated with the FTP data
protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()"
call checked "proto_ftp_data", and the removed "pinfo->current_proto ="
line set it to "FTP-DATA", so it should be associated with
"proto_ftp_data").
Make the H1 dissector check whether the frame has at least 2 bytes in it
before checking the first two bytes; heuristic dissectors must not throw
exceptions until they've accepted the packet as one of theirs.
Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()"
in some dissectors where the result of "tvb_get_ptr()" is used only in
the "format_text()" call.
In the Quake dissector, don't check whether there are at least 4 bytes
in the packet - if we return, the packet won't be dissected at all (it's
not as if some other dissector will get to handle it), and, if we don't
return, we'll throw an exception if there aren't at least 4 bytes in the
packet, so the packet will be marked as short or malformed, as
appropriate.
In the RIPng dissector, associate the table of strings for the command
field with the command field, so that the dissector doesn't have to
format the string for the protocol tree entry itself, and so that the
filter construction dialog box can let you select "Request" or
"Response" from a list rather than requiring you to know the values for
"Request" and "Response".
Make "dissect_rpc()" static, as it's called only through a heuristic
dissector list.
Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols;
the string used is from a table provided by the dissector, and is a
string constant.
Don't format the Info column for WSP into a buffer and then format that
buffer into the column with "%s" - "col_add_fstr()" can do the
formatting for you, without having to allocate your own buffer (or run
through the *printf machinery twice).
Don't fetch fields from the WTP packet until you're ready to use them,
so that you don't throw an exception before you even set the Protocol
column or clear the Info column.
Use "pinfo->destport", not "pi.destport", in the Zebra dissector when
checking whether the packet is a request or reply, and do the check by
comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that
if the dissector is ever registered on another port, it still correctly
determines whether the packet is a request or reply - the Network
Monitor HTTP dissector has port 80 wired into its brain, which is a bit
irritating if you're trying to get it to dissect HTTP proxy traffic on
port 3128 or proxy administration UI traffic on port 3132).
svn path=/trunk/; revision=2931
2001-01-22 08:03:46 +00:00
|
|
|
b0 = tvb_get_guint8 (tvb, offCur + 0);
|
|
|
|
|
fCon = b0 & 0x80;
|
|
|
|
|
fRID = retransmission_indicator( b0 );
|
|
|
|
|
pdut = pdu_type( b0 );
|
|
|
|
|
|
2000-11-04 03:30:41 +00:00
|
|
|
/* Develop the string to put in the Info column */
|
|
|
|
|
cchInfo = snprintf( szInfo, sizeof( szInfo ), "WTP %s", vals_pdu_type[ ( int )pdut ].strptr );
|
|
|
|
|
|
|
|
|
|
switch( pdut ) {
|
|
|
|
|
case INVOKE:
|
|
|
|
|
clsTransaction = transaction_class( tvb_get_guint8 (tvb, offCur + 3) );
|
|
|
|
|
snprintf( szInfo + cchInfo, sizeof( szInfo ) - cchInfo, " Class %d", clsTransaction );
|
|
|
|
|
|
|
|
|
|
case ABORT:
|
|
|
|
|
case SEGMENTED_INVOKE:
|
|
|
|
|
case SEGMENTED_RESULT:
|
|
|
|
|
cbHeader = 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RESULT:
|
|
|
|
|
case ACK:
|
|
|
|
|
cbHeader = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case NEGATIVE_ACK:
|
|
|
|
|
/* Varible number of missing packets */
|
|
|
|
|
numMissing = tvb_get_guint8 (tvb, offCur + 3);
|
|
|
|
|
cbHeader = numMissing + 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2000-11-04 07:38:19 +00:00
|
|
|
break;
|
2000-11-04 03:30:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if( fRID ) {
|
|
|
|
|
strcat( szInfo, " R" );
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: cbHeader = %d\n", cbHeader );
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* This field shows up as the "Info" column in the display; you should make
|
|
|
|
|
it, if possible, summarize what's in the packet, so that a user looking
|
2000-11-19 08:54:37 +00:00
|
|
|
at the list of packets can tell what type of packet it is. */
|
2000-11-04 03:30:41 +00:00
|
|
|
if (check_col(fdata, COL_INFO)) {
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: (6) About to set info_col header to %s\n", szInfo );
|
|
|
|
|
#endif
|
|
|
|
|
col_add_str(fdata, COL_INFO, szInfo );
|
|
|
|
|
};
|
|
|
|
|
/* In the interest of speed, if "tree" is NULL, don't do any work not
|
|
|
|
|
necessary to generate protocol tree items. */
|
|
|
|
|
if (tree) {
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: cbHeader = %d\n", cbHeader );
|
|
|
|
|
#endif
|
|
|
|
|
ti = proto_tree_add_item(tree, proto_wtp, tvb, offCur, cbHeader, bo_little_endian);
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: (7) Returned from proto_tree_add_item\n" );
|
|
|
|
|
#endif
|
|
|
|
|
wtp_tree = proto_item_add_subtree(ti, ett_wtp);
|
|
|
|
|
|
|
|
|
|
/* Code to process the packet goes here */
|
|
|
|
|
{
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: cbHeader = %d\n", cbHeader );
|
|
|
|
|
fprintf( stderr, "dissect_wtp: offCur = %d\n", offCur );
|
|
|
|
|
fprintf( stderr, "dissect_wtp: About to call proto_tree_add_item with %p %d %p %d %d %d\n",
|
|
|
|
|
wtp_tree, hf_wtp_header_fixed_part, tvb, offCur, cbHeader, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_tree, hf_wtp_header_fixed_part, tvb, offCur, cbHeader, bo_little_endian );
|
|
|
|
|
fprintf( stderr, "dissect_wtp: (6) Returned from proto_tree_add_item\n" );
|
|
|
|
|
#endif
|
|
|
|
|
wtp_header_fixed = proto_item_add_subtree(
|
|
|
|
|
ti,
|
|
|
|
|
ett_header
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
/* Add common items: only CON and PDU Type */
|
|
|
|
|
ti = proto_tree_add_item(
|
|
|
|
|
wtp_header_fixed, /* tree */
|
|
|
|
|
hf_wtp_header_flag_continue, /* id */
|
|
|
|
|
tvb,
|
|
|
|
|
offCur, /* start of high light */
|
|
|
|
|
1, /* length of high light */
|
|
|
|
|
b0 /* value */
|
|
|
|
|
);
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_pdu_type, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
|
|
|
|
|
switch( pdut ) {
|
|
|
|
|
case INVOKE:
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_Trailer, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_RID, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID_response, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Inv_version , tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Inv_flag_TIDNew, tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Inv_flag_UP, tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Inv_Reserved, tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Inv_TransactionClass, tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case RESULT:
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_Trailer, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_RID, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID_response, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ACK:
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Ack_flag_TVETOK, tvb, offCur, 1, bo_big_endian );
|
|
|
|
|
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_RID, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID_response, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case ABORT:
|
|
|
|
|
abortType = tvb_get_guint8 (tvb, offCur) & 0x07;
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Abort_type , tvb, offCur , 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID_response, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
|
|
|
|
|
if (abortType == PROVIDER)
|
|
|
|
|
{
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Abort_reason_provider , tvb, offCur + 3 , 1, bo_little_endian );
|
|
|
|
|
}
|
|
|
|
|
else if (abortType == USER)
|
|
|
|
|
{
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_Abort_reason_user , tvb, offCur + 3 , 1, bo_little_endian );
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SEGMENTED_INVOKE:
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_Trailer, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_RID, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID_response, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_sequence_number , tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SEGMENTED_RESULT:
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_Trailer, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_RID, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID_response, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_sequence_number , tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case NEGATIVE_ACK:
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_RID, tvb, offCur, 1, bo_little_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID_response, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_flag_TID, tvb, offCur + 1, 2, bo_big_endian );
|
|
|
|
|
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_missing_packets , tvb, offCur + 3, 1, bo_little_endian );
|
|
|
|
|
/* Iterate through missing packets */
|
|
|
|
|
for (i=0; i<numMissing; i++)
|
|
|
|
|
{
|
|
|
|
|
ti = proto_tree_add_item( wtp_header_fixed, hf_wtp_header_sequence_number , tvb, offCur + i, 1, bo_little_endian );
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if( fCon ) {
|
|
|
|
|
/* There is a variable part if the Con flag is set */
|
|
|
|
|
ti = proto_tree_add_bytes_format(
|
|
|
|
|
wtp_tree, /* tree */
|
|
|
|
|
hf_wtp_header_variable_part, /* id */
|
|
|
|
|
tvb,
|
|
|
|
|
offCur + 4, /* start */
|
|
|
|
|
4, /* length */
|
|
|
|
|
"What should go here!", /* value */
|
|
|
|
|
"Header (Variable part) %02X %02X %02X %02X" , /* format */
|
|
|
|
|
0, 1, 2, 3
|
|
|
|
|
);
|
|
|
|
|
} else {
|
|
|
|
|
/* There is no variable part */
|
|
|
|
|
}; /* End of variable part of header */
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: (4) tree was %p\n", tree );
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Any remaining data ought to be WSP data, so hand off to the WSP dissector */
|
|
|
|
|
if (tvb_reported_length (tvb) > cbHeader)
|
|
|
|
|
{
|
|
|
|
|
wsp_tvb = tvb_new_subset(tvb, cbHeader, -1, tvb_reported_length (tvb)-cbHeader);
|
2001-01-03 08:42:48 +00:00
|
|
|
call_dissector(wsp_handle, wsp_tvb, pinfo, tree);
|
2000-11-04 03:30:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf( stderr, "dissect_wtp: (leaving) fdata->cinfo is %p\n", fdata->cinfo );
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char pdu_type(unsigned char octet)
|
|
|
|
|
{
|
|
|
|
|
char ch = (octet >> 3) & 0x0F;
|
|
|
|
|
/* Note pdu type must not be 0x00 */
|
|
|
|
|
return ch;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static char transaction_class(unsigned char octet)
|
|
|
|
|
{
|
|
|
|
|
char ch = (octet >> 0) & 0x03; /* ......XX */
|
|
|
|
|
return ch;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static char retransmission_indicator(unsigned char octet)
|
|
|
|
|
{
|
|
|
|
|
char ch = (octet >> 0) & 0x01; /* ......,X */
|
|
|
|
|
return ch;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Register the protocol with Ethereal */
|
|
|
|
|
void
|
|
|
|
|
proto_register_wtp(void)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
/* Setup list of header fields */
|
|
|
|
|
static hf_register_info hf[] = {
|
|
|
|
|
{ &hf_wtp_header_fixed_part,
|
|
|
|
|
{ "Header",
|
|
|
|
|
"wtp.header_fixed_part",
|
|
|
|
|
FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
|
|
|
"Fixed part of the header"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_flag_continue,
|
|
|
|
|
{ "Continue Flag",
|
|
|
|
|
"wtp.continue-flag",
|
|
|
|
|
FT_BOOLEAN, 8, TFS( &continue_truth ), 0x80,
|
|
|
|
|
"Continue Flag"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_pdu_type,
|
|
|
|
|
{ "PDU Type",
|
|
|
|
|
"wtp.pdu-type",
|
|
|
|
|
FT_UINT8, BASE_HEX, VALS( vals_pdu_type ), 0x78,
|
|
|
|
|
"PDU Type"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_flag_Trailer,
|
|
|
|
|
{ "Trailer Flags",
|
|
|
|
|
"wtp.trailer-flags",
|
|
|
|
|
FT_UINT8, BASE_HEX, VALS( vals_transmission_trailer ), 0x06,
|
|
|
|
|
"PDU Type"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_flag_RID,
|
|
|
|
|
{ "Re-transmission Indicator",
|
|
|
|
|
"wtp.RID",
|
|
|
|
|
FT_BOOLEAN, 8, TFS( &RID_truth ), 0x01,
|
|
|
|
|
"Re-transmission Indicator"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_flag_TID_response,
|
|
|
|
|
{ "TID Response",
|
|
|
|
|
"wtp.TID.response",
|
|
|
|
|
FT_BOOLEAN, 16, TFS( &tid_response_truth ), 0x8000,
|
|
|
|
|
"TID Response"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_flag_TID,
|
|
|
|
|
{ "Transmission ID",
|
|
|
|
|
"wtp.TID",
|
|
|
|
|
FT_UINT16, BASE_HEX, NULL, 0x7FFF,
|
|
|
|
|
"Transmission ID"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Inv_version,
|
|
|
|
|
{ "Version",
|
|
|
|
|
"wtp.header.version",
|
|
|
|
|
FT_UINT8, BASE_HEX, VALS( vals_version ), 0xC0,
|
|
|
|
|
"Version"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Inv_flag_TIDNew,
|
|
|
|
|
{ "TIDNew",
|
|
|
|
|
"wtp.header.TIDNew",
|
|
|
|
|
FT_BOOLEAN, 8, TFS( &TIDNew_truth ), 0x20,
|
|
|
|
|
"TIDNew"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Inv_flag_UP,
|
|
|
|
|
{ "U/P flag",
|
|
|
|
|
"wtp.header.UP",
|
|
|
|
|
FT_BOOLEAN, 8, TFS( &UP_truth ), 0x10,
|
|
|
|
|
"U/P Flag"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Inv_Reserved,
|
|
|
|
|
{ "Reserved",
|
|
|
|
|
"wtp.inv.reserved",
|
|
|
|
|
FT_UINT8, BASE_HEX, NULL, 0x0C,
|
|
|
|
|
"Reserved"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Inv_TransactionClass,
|
|
|
|
|
{ "Transaction Class",
|
|
|
|
|
"wtp.inv.transaction-class",
|
|
|
|
|
FT_UINT8, BASE_HEX, NULL, 0x03,
|
|
|
|
|
"Transaction Class"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Ack_flag_TVETOK,
|
|
|
|
|
{ "Tve/Tok flag",
|
|
|
|
|
"wtp.ack.tvetok",
|
|
|
|
|
FT_BOOLEAN, 8, TFS( &TVETOK_truth ), 0x04,
|
|
|
|
|
"Tve/Tok flag"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Abort_type,
|
|
|
|
|
{ "Abort Type",
|
|
|
|
|
"wtp.abort.type",
|
|
|
|
|
FT_UINT8, BASE_HEX, VALS ( vals_abort_type ), 0x07,
|
|
|
|
|
"Abort Type"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_Abort_reason_provider,
|
|
|
|
|
{ "Abort Reason",
|
|
|
|
|
"wtp.abort.reason.provider",
|
|
|
|
|
FT_UINT8, BASE_HEX, VALS ( vals_abort_reason_provider ), 0x00,
|
|
|
|
|
"Abort Reason"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
/* Assume WSP is the user and use its reason codes */
|
|
|
|
|
{ &hf_wtp_header_Abort_reason_user,
|
|
|
|
|
{ "Abort Reason",
|
|
|
|
|
"wtp.abort.reason.user",
|
|
|
|
|
FT_UINT8, BASE_HEX, VALS ( vals_wsp_reason_codes ), 0x00,
|
|
|
|
|
"Abort Reason"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_sequence_number,
|
|
|
|
|
{ "Packet Sequence Number",
|
|
|
|
|
"wtp.header.sequence",
|
|
|
|
|
FT_UINT8, BASE_HEX, NULL, 0x00,
|
|
|
|
|
"Packet Sequence Number"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_missing_packets,
|
|
|
|
|
{ "Missing Packets",
|
|
|
|
|
"wtp.header.missing_packets",
|
|
|
|
|
FT_UINT8, BASE_HEX, NULL, 0x00,
|
|
|
|
|
"Missing Packets"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_header_variable_part,
|
|
|
|
|
{ "Header: Variable part",
|
|
|
|
|
"wtp.header_variable_part",
|
|
|
|
|
FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
|
|
|
"Variable part of the header"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
{ &hf_wtp_data,
|
|
|
|
|
{ "Data",
|
|
|
|
|
"wtp.header_data",
|
|
|
|
|
FT_BYTES, BASE_HEX, NULL, 0x0,
|
|
|
|
|
"Data"
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Setup protocol subtree array */
|
|
|
|
|
static gint *ett[] = {
|
|
|
|
|
&ett_wtp,
|
|
|
|
|
&ett_header,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Register the protocol name and description */
|
|
|
|
|
proto_wtp = proto_register_protocol(
|
|
|
|
|
"Wireless Transaction Protocol", /* protocol name for use by ethereal */
|
2001-01-03 06:56:03 +00:00
|
|
|
"WTP", /* short version of name */
|
2000-11-04 03:30:41 +00:00
|
|
|
"wap-wsp-wtp" /* Abbreviated protocol name, should Match IANA
|
|
|
|
|
< URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ >
|
|
|
|
|
*/
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
/* Required function calls to register the header fields and subtrees used */
|
|
|
|
|
proto_register_field_array(proto_wtp, hf, array_length(hf));
|
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
proto_reg_handoff_wtp(void)
|
|
|
|
|
{
|
2001-01-03 08:42:48 +00:00
|
|
|
/*
|
|
|
|
|
* Get a handle for the IP WSP dissector.
|
|
|
|
|
*/
|
|
|
|
|
wsp_handle = find_dissector("wsp");
|
|
|
|
|
|
2001-01-09 06:32:10 +00:00
|
|
|
dissector_add("udp.port", UDP_PORT_WTP_WSP, dissect_wtp, proto_wtp);
|
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
Don't use
col_add_fstr(..., "%s", string);
Use
col_add_str(..., string);
as it does the same thing, but doesn't drag all the heavy *printf
machinery in.
Fix the DDTP dissector to set the Info column regardless of whether
we're building a protocol tree or not, and to set it to "Encrypted
payload" if the payload is encrypted. Also fix a typo in a field name.
Register the FTP data dissector as being associated with the FTP data
protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()"
call checked "proto_ftp_data", and the removed "pinfo->current_proto ="
line set it to "FTP-DATA", so it should be associated with
"proto_ftp_data").
Make the H1 dissector check whether the frame has at least 2 bytes in it
before checking the first two bytes; heuristic dissectors must not throw
exceptions until they've accepted the packet as one of theirs.
Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()"
in some dissectors where the result of "tvb_get_ptr()" is used only in
the "format_text()" call.
In the Quake dissector, don't check whether there are at least 4 bytes
in the packet - if we return, the packet won't be dissected at all (it's
not as if some other dissector will get to handle it), and, if we don't
return, we'll throw an exception if there aren't at least 4 bytes in the
packet, so the packet will be marked as short or malformed, as
appropriate.
In the RIPng dissector, associate the table of strings for the command
field with the command field, so that the dissector doesn't have to
format the string for the protocol tree entry itself, and so that the
filter construction dialog box can let you select "Request" or
"Response" from a list rather than requiring you to know the values for
"Request" and "Response".
Make "dissect_rpc()" static, as it's called only through a heuristic
dissector list.
Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols;
the string used is from a table provided by the dissector, and is a
string constant.
Don't format the Info column for WSP into a buffer and then format that
buffer into the column with "%s" - "col_add_fstr()" can do the
formatting for you, without having to allocate your own buffer (or run
through the *printf machinery twice).
Don't fetch fields from the WTP packet until you're ready to use them,
so that you don't throw an exception before you even set the Protocol
column or clear the Info column.
Use "pinfo->destport", not "pi.destport", in the Zebra dissector when
checking whether the packet is a request or reply, and do the check by
comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that
if the dissector is ever registered on another port, it still correctly
determines whether the packet is a request or reply - the Network
Monitor HTTP dissector has port 80 wired into its brain, which is a bit
irritating if you're trying to get it to dissect HTTP proxy traffic on
port 3128 or proxy administration UI traffic on port 3132).
svn path=/trunk/; revision=2931
2001-01-22 08:03:46 +00:00
|
|
|
/* dissector_add("udp.port", UDP_PORT_WTLS_WTP_WSP, dissect_wtp, proto_wtp); */
|
2000-11-04 03:30:41 +00:00
|
|
|
}
|