diff options
author | Guy Harris <guy@alum.mit.edu> | 2001-04-19 23:02:44 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2001-04-19 23:02:44 +0000 |
commit | 0fa45bb541cd927ff1fd8b5cb3f8f4535d0e1b50 (patch) | |
tree | 39e71d3f736bb959b205fc75f44312f0b79afd95 | |
parent | 477cefc2d5af64ed6d46e5bea91eebe5a9618350 (diff) |
FT_UINTn and FT_INTn fields must always have a base selected for them;
otherwise, the filtering GUI gets very upset when you try to construct a
filter expression to test the value of that field. Make them BASE_DEC.
svn path=/trunk/; revision=3334
-rw-r--r-- | packet-ipv6.c | 8 | ||||
-rw-r--r-- | packet-ipx.c | 6 | ||||
-rw-r--r-- | packet-isl.c | 6 | ||||
-rw-r--r-- | packet-mpls.c | 4 | ||||
-rw-r--r-- | packet-sna.c | 6 | ||||
-rw-r--r-- | packet-socks.c | 4 | ||||
-rw-r--r-- | packet-tns.c | 6 | ||||
-rw-r--r-- | packet-who.c | 4 | ||||
-rw-r--r-- | packet-wtls.c | 6 | ||||
-rw-r--r-- | packet-zebra.c | 4 |
10 files changed, 27 insertions, 27 deletions
diff --git a/packet-ipv6.c b/packet-ipv6.c index ce4da4d530..8ed3243b95 100644 --- a/packet-ipv6.c +++ b/packet-ipv6.c @@ -1,7 +1,7 @@ /* packet-ipv6.c * Routines for IPv6 packet disassembly * - * $Id: packet-ipv6.c,v 1.53 2001/04/17 06:43:18 guy Exp $ + * $Id: packet-ipv6.c,v 1.54 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -869,15 +869,15 @@ proto_register_ipv6(void) "" }}, { &hf_ipv6_mipv6_sub_type, { "Sub-Option Type ", "ipv6.mipv6_sub_type", - FT_UINT8, BASE_NONE, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "" }}, { &hf_ipv6_mipv6_sub_length, { "Sub-Option Length ", "ipv6.mipv6_sub_length", - FT_UINT8, BASE_NONE, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "" }}, { &hf_ipv6_mipv6_sub_unique_ID, { "Unique Identifier ", "ipv6.mipv6_sub_unique_ID", - FT_UINT16, BASE_NONE, NULL, 0x0, + FT_UINT16, BASE_DEC, NULL, 0x0, "" }}, { &hf_ipv6_mipv6_sub_alternative_COA, { "Alternative Care of Address ", "ipv6.mipv6_sub_alternative_COA", diff --git a/packet-ipx.c b/packet-ipx.c index ee8ff83061..506a71f0ed 100644 --- a/packet-ipx.c +++ b/packet-ipx.c @@ -2,7 +2,7 @@ * Routines for NetWare's IPX * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-ipx.c,v 1.83 2001/04/17 06:43:18 guy Exp $ + * $Id: packet-ipx.c,v 1.84 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -766,12 +766,12 @@ proto_register_ipx(void) static hf_register_info hf_ipxmsg[] = { { &hf_msg_conn, { "Connection Number", "ipxmsg.conn", - FT_UINT8, BASE_NONE, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "Connection Number" }}, { &hf_msg_sigchar, { "Signature Char", "ipxmsg.sigchar", - FT_UINT8, BASE_NONE, VALS(ipxmsg_sigchar_vals), 0x0, + FT_UINT8, BASE_DEC, VALS(ipxmsg_sigchar_vals), 0x0, "Signature Char" }} }; diff --git a/packet-isl.c b/packet-isl.c index e43e6a3e00..b704156031 100644 --- a/packet-isl.c +++ b/packet-isl.c @@ -1,7 +1,7 @@ /* packet-isl.c * Routines for Cisco ISL Ethernet header disassembly * - * $Id: packet-isl.c,v 1.23 2001/01/21 22:10:22 guy Exp $ + * $Id: packet-isl.c,v 1.24 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -284,10 +284,10 @@ proto_register_isl(void) { "Destination", "isl.dst", FT_ETHER, BASE_NONE, NULL, 0x0, "Destination Address" }}, { &hf_isl_type, - { "Type", "isl.type", FT_UINT8, BASE_NONE, + { "Type", "isl.type", FT_UINT8, BASE_DEC, VALS(type_vals), 0xF0, "Type" }}, { &hf_isl_user_eth, - { "User", "isl.user_eth", FT_UINT8, BASE_NONE, + { "User", "isl.user_eth", FT_UINT8, BASE_DEC, VALS(ether_user_vals), 0x0F, "Priority (for Ethernet)" }}, { &hf_isl_user, { "User", "isl.user", FT_UINT8, BASE_HEX, NULL, 0x0F, diff --git a/packet-mpls.c b/packet-mpls.c index 58aef1e002..e8b677dd44 100644 --- a/packet-mpls.c +++ b/packet-mpls.c @@ -3,7 +3,7 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-mpls.c,v 1.18 2001/04/17 06:43:19 guy Exp $ + * $Id: packet-mpls.c,v 1.19 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -89,7 +89,7 @@ static int mpls_filter[MPLSF_MAX]; static hf_register_info mplsf_info[] = { /* {&mpls_filter[MPLSF_PACKET], - {"MPLS Label Switched Packet", "mpls", FT_UINT8, BASE_NONE, NULL, 0x0, + {"MPLS Label Switched Packet", "mpls", FT_UINT8, BASE_DEC, NULL, 0x0, "" }},*/ {&mpls_filter[MPLSF_LABEL], diff --git a/packet-sna.c b/packet-sna.c index 8dcf6dfdea..f51b5b1934 100644 --- a/packet-sna.c +++ b/packet-sna.c @@ -2,7 +2,7 @@ * Routines for SNA * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-sna.c,v 1.27 2001/03/22 16:24:14 gram Exp $ + * $Id: packet-sna.c,v 1.28 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -885,7 +885,7 @@ proto_register_sna(void) "Format Identification" }}, { &hf_sna_th_mpf, - { "Mapping Field", "sna.th.mpf", FT_UINT8, BASE_NONE, VALS(sna_th_mpf_vals), 0x0c, + { "Mapping Field", "sna.th.mpf", FT_UINT8, BASE_DEC, VALS(sna_th_mpf_vals), 0x0c, "The Mapping Field specifies whether the information field" " associated with the TH is a complete or partial BIU." }}, @@ -908,7 +908,7 @@ proto_register_sna(void) "" }}, { &hf_sna_th_snf, - { "Sequence Number Field", "sna.th.snf", FT_UINT16, BASE_NONE, NULL, 0x0, + { "Sequence Number Field", "sna.th.snf", FT_UINT16, BASE_DEC, NULL, 0x0, "The Sequence Number Field contains a numerical identifier for" " the associated BIU."}}, diff --git a/packet-socks.c b/packet-socks.c index 2bd573df4e..f980c5988e 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.18 2001/01/10 10:59:11 guy Exp $ + * $Id: packet-socks.c,v 1.19 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1113,7 +1113,7 @@ proto_register_socks( void){ { &hf_socks_ver, - { "Version", "socks.ver", FT_UINT8, BASE_NONE, NULL, + { "Version", "socks.ver", FT_UINT8, BASE_DEC, NULL, 0x0, "" } }, diff --git a/packet-tns.c b/packet-tns.c index 964b16f3f9..c790df8d94 100644 --- a/packet-tns.c +++ b/packet-tns.c @@ -1,7 +1,7 @@ /* packet-tns.c * Routines for Oracle TNS packet dissection * - * $Id: packet-tns.c,v 1.13 2001/02/03 08:21:47 guy Exp $ + * $Id: packet-tns.c,v 1.14 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -298,7 +298,7 @@ void proto_register_tns(void) "Request", "tns.request", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "TRUE if TNS request" }}, { &hf_tns_length, { - "Packet Length", "tns.length", FT_UINT32, BASE_NONE, + "Packet Length", "tns.length", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of TNS packet" }}, { &hf_tns_packet_checksum, { "Packet Checksum", "tns.packet_checksum", FT_UINT16, BASE_HEX, @@ -322,7 +322,7 @@ void proto_register_tns(void) "Reserved Byte", "tns.reserved_byte", FT_BYTES, BASE_HEX, NULL, 0x0, "Reserved Byte" }}, { &hf_tns_packet_type, { - "Packet Type", "tns.type", FT_UINT8, BASE_NONE, + "Packet Type", "tns.type", FT_UINT8, BASE_DEC, VALS(tns_type_vals), 0x0, "Type of TNS packet" }} }; diff --git a/packet-who.c b/packet-who.c index e008613b3d..ae8455e930 100644 --- a/packet-who.c +++ b/packet-who.c @@ -2,7 +2,7 @@ * Routines for who protocol (see man rwhod) * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-who.c,v 1.15 2001/01/22 08:03:46 guy Exp $ + * $Id: packet-who.c,v 1.16 2001/04/19 23:02:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -289,7 +289,7 @@ proto_register_who(void) "" }}, { &hf_who_idle, - { "Time Idle", "who.idle", FT_UINT32, BASE_NONE, NULL, 0x0, + { "Time Idle", "who.idle", FT_UINT32, BASE_DEC, NULL, 0x0, "" }}, }; diff --git a/packet-wtls.c b/packet-wtls.c index 1917d5519f..452e385555 100644 --- a/packet-wtls.c +++ b/packet-wtls.c @@ -2,7 +2,7 @@ * * Routines to dissect WTLS component of WAP traffic. * - * $Id: packet-wtls.c,v 1.6 2001/04/18 20:01:17 guy Exp $ + * $Id: packet-wtls.c,v 1.7 2001/04/19 23:02:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1064,14 +1064,14 @@ proto_register_wtls(void) { &hf_wtls_record, { "Record", "wsp.wtls.record", - FT_UINT8, BASE_NONE, VALS ( wtls_vals_record_type ), 0x0f, + FT_UINT8, BASE_DEC, VALS ( wtls_vals_record_type ), 0x0f, "Record" } }, { &hf_wtls_record_type, { "Record Type", "wsp.wtls.rec_type", - FT_UINT8, BASE_NONE, VALS ( wtls_vals_record_type ), 0x0f, + FT_UINT8, BASE_DEC, VALS ( wtls_vals_record_type ), 0x0f, "Record Type" } }, diff --git a/packet-zebra.c b/packet-zebra.c index 33b194ea85..ed67210d02 100644 --- a/packet-zebra.c +++ b/packet-zebra.c @@ -3,7 +3,7 @@ * * Jochen Friedrich <jochen@scram.de> * - * $Id: packet-zebra.c,v 1.10 2001/03/13 21:34:24 gram Exp $ + * $Id: packet-zebra.c,v 1.11 2001/04/19 23:02:43 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -611,7 +611,7 @@ proto_register_zebra(void) "Destination IPv6 field" }}, { &hf_zebra_nexthopnum, { "Nexthop Number", "zebra.nexthopnum", - FT_UINT8, BASE_NONE, NULL, 0x0, + FT_UINT8, BASE_DEC, NULL, 0x0, "Number of nexthops in route" }}, { &hf_zebra_nexthop4, { "Nexthop", "zebra.nexthop4", |