diff options
| author | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-01-03 16:41:08 +0000 |
|---|---|---|
| committer | Gilbert Ramirez <gram@alumni.rice.edu> | 2001-01-03 16:41:08 +0000 |
| commit | 5b7f184296c4e10f933d0448f40d267fb1b583f7 (patch) | |
| tree | e67e6a292cf66edf79431f30778f239fc9468f4e /packet-wtp.c | |
| parent | b151ddecbb6800271e1cc2b8b0d2bb355dadbe89 (diff) | |
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away
with not terminating their arrays because they knew the limits of the
value used to look up strings in the value_string array, but the
dfilter_expr_dlg does not know these limits and must rely on the terminating
{0, NULL} record.
Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8
but was defined as FT_BOOLEAN.
In WTP, fixed a value string which had duplicate keys.
svn path=/trunk/; revision=2817
Diffstat (limited to 'packet-wtp.c')
| -rw-r--r-- | packet-wtp.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/packet-wtp.c b/packet-wtp.c index a8c1dfb1cd..f578d0d671 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.7 2001/01/03 08:42:48 guy Exp $ + * $Id: packet-wtp.c,v 1.8 2001/01/03 16:41:08 gram Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -93,7 +93,8 @@ static const value_string vals_pdu_type[] = { { 4, "Abort" }, { 5, "Segmented Invoke" }, { 6, "Segmented Result" }, - { 6, "Negative Ack" }, + { 7, "Negative Ack" }, + { 0, NULL } }; static const value_string vals_transmission_trailer[] = { @@ -101,6 +102,7 @@ static const value_string vals_transmission_trailer[] = { { 1, "Last packet of message" }, { 2, "Last packet of group" }, { 3, "Re-assembly not supported" }, + { 0, NULL } }; static const value_string vals_version[] = { @@ -108,11 +110,13 @@ static const value_string vals_version[] = { { 1, "Undefined" }, { 2, "Undefined" }, { 3, "Undefined" }, + { 0, NULL } }; static const value_string vals_abort_type[] = { { 0, "Provider" }, - { 1, "User (WSP)" } + { 1, "User (WSP)" }, + { 0, NULL } }; static const value_string vals_abort_reason_provider[] = { @@ -125,7 +129,8 @@ static const value_string vals_abort_reason_provider[] = { { 0x06, "WTP Version Zero" }, { 0x07, "Capacity Temporarily Exceeded" }, { 0x08, "No Response" }, - { 0x09, "Message Too Large" } + { 0x09, "Message Too Large" }, + { 0x00, NULL } }; /* File scoped variables for the protocol and registered fields */ |