Get rid of BASE_BIN - it's just the same as BASE_DEC, but people seemed

to be using it for stuff that should be hex, and for stuff that should
be Boolean.  Use BASE_DEC if it should be decimal, BASE_HEX if it should
be hex, and make it Boolean if it should be Boolean.

svn path=/trunk/; revision=7053

20 files changed, 137 insertions, 154 deletions

diff --git a/doc/README.developer b/doc/README.developer
index c8dc57bdde..64ab03374f 100644
--- a/doc/README.developer
+++ b/doc/README.developer
@@ -1,4 +1,4 @@
-$Id: README.developer,v 1.69 2003/01/29 00:39:02 guy Exp $
+$Id: README.developer,v 1.70 2003/01/31 03:17:50 guy Exp $
 
 This file is a HOWTO for Ethereal developers. It describes how to start coding
 a Ethereal protocol dissector and the use some of the important functions and
@@ -158,7 +158,7 @@ code inside
 
 is needed only if you are using the "snprintf()" function.
 
-The "$Id: README.developer,v 1.69 2003/01/29 00:39:02 guy Exp $"
+The "$Id: README.developer,v 1.70 2003/01/31 03:17:50 guy Exp $"
 in the comment will be updated by CVS when the file is
 checked in; it will allow the RCS "ident" command to report which
 version of the file is currently checked out.
@@ -168,7 +168,7 @@ version of the file is currently checked out.
  * Routines for PROTONAME dissection
  * Copyright 2000, YOUR_NAME <YOUR_EMAIL_ADDRESS>
  *
- * $Id: README.developer,v 1.69 2003/01/29 00:39:02 guy Exp $
+ * $Id: README.developer,v 1.70 2003/01/31 03:17:50 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -370,7 +370,7 @@ FIELDTYPE	FT_NONE, FT_BOOLEAN, FT_UINT8, FT_UINT16, FT_UINT24,
 		FT_RELATIVE_TIME, FT_STRING, FT_STRINGZ, FT_UINT_STRING,
 		FT_ETHER, FT_BYTES, FT_IPv4, FT_IPv6, FT_IPXNET,
 		FT_FRAMENUM
-FIELDBASE	BASE_NONE, BASE_DEC, BASE_HEX, BASE_OCT, BASE_BIN
+FIELDBASE	BASE_NONE, BASE_DEC, BASE_HEX, BASE_OCT
 FIELDCONVERT	VALS(x), TFS(x), NULL
 BITMASK		Usually 0x0 unless using the TFS(x) field conversion.
 FIELDDESCR	A brief description of the field.
@@ -821,12 +821,10 @@ are:
 
 	BASE_DEC,
 	BASE_HEX,
-	BASE_OCT,
-	BASE_BIN
+	BASE_OCT
 
 BASE_DEC, BASE_HEX, and BASE_OCT are decimal, hexadecimal, and octal,
-respectively.  BASE_BIN is reserved for binary, although it's currently
-treated as decimal - if you want decimal, use BASE_DEC, not BASE_BIN.
+respectively.
 
 For FT_BOOLEAN fields that are also bitfields, 'display' is used to tell
 the proto_tree how wide the parent bitfield is.  With integers this is
diff --git a/epan/proto.c b/epan/proto.c
index 3e937fbb08..3eb3ed441a 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,7 +1,7 @@
 /* proto.c
  * Routines for protocol tree
  *
- * $Id: proto.c,v 1.80 2003/01/21 19:20:49 gerald Exp $
+ * $Id: proto.c,v 1.81 2003/01/31 03:17:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2808,7 +2808,6 @@ hfinfo_uint_vals_format(header_field_info *hfinfo)
 
 	switch(hfinfo->display) {
 		case BASE_DEC:
-		case BASE_BIN: /* I'm lazy */
 			format = "%s: %s (%u)";
 			break;
 		case BASE_OCT: /* I'm lazy */
@@ -2854,7 +2853,6 @@ hfinfo_uint_format(header_field_info *hfinfo)
 	} else {
 		switch(hfinfo->display) {
 			case BASE_DEC:
-			case BASE_BIN: /* I'm lazy */
 				format = "%s: %u";
 				break;
 			case BASE_OCT: /* I'm lazy */
@@ -2894,7 +2892,6 @@ hfinfo_int_vals_format(header_field_info *hfinfo)
 
 	switch(hfinfo->display) {
 		case BASE_DEC:
-		case BASE_BIN: /* I'm lazy */
 			format = "%s: %s (%d)";
 			break;
 		case BASE_OCT: /* I'm lazy */
@@ -2934,7 +2931,6 @@ hfinfo_int_format(header_field_info *hfinfo)
 	/* Pick the proper format string */
 	switch(hfinfo->display) {
 		case BASE_DEC:
-		case BASE_BIN: /* I'm lazy */
 			format = "%s: %d";
 			break;
 		case BASE_OCT: /* I'm lazy */
@@ -3254,7 +3250,6 @@ hfinfo_numeric_format(header_field_info *hfinfo)
 		switch(hfinfo->display) {
 			case BASE_DEC:
 			case BASE_OCT: /* I'm lazy */
-			case BASE_BIN: /* I'm lazy */
 				switch(hfinfo->type) {
 					case FT_UINT8:
 					case FT_UINT16:
diff --git a/epan/proto.h b/epan/proto.h
index 97c849f4ff..47cd2dd205 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,7 +1,7 @@
 /* proto.h
  * Definitions for protocol display
  *
- * $Id: proto.h,v 1.37 2002/11/28 01:46:12 guy Exp $
+ * $Id: proto.h,v 1.38 2003/01/31 03:17:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -61,8 +61,7 @@ enum {
 	BASE_NONE,
 	BASE_DEC,
 	BASE_HEX,
-	BASE_OCT,
-	BASE_BIN
+	BASE_OCT
 };
 
 typedef struct _header_field_info header_field_info;
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 3a1dc42cc2..12abfb2b36 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/gtk/dfilter_expr_dlg.c
@@ -7,7 +7,7 @@
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> and
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: dfilter_expr_dlg.c,v 1.31 2002/11/10 11:00:29 oabad Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.32 2003/01/31 03:17:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -725,7 +725,6 @@ value_list_sel_cb(GtkTreeSelection *sel, gpointer value_entry_arg)
         switch (hfinfo->display) {
 
         case BASE_DEC:
-        case BASE_BIN:	/* binary - treated as decimal, for now */
             switch (hfinfo->type) {
 
             case FT_UINT8:
diff --git a/packet-auto_rp.c b/packet-auto_rp.c
index 6aa61ee539..d6acab5ebf 100644
--- a/packet-auto_rp.c
+++ b/packet-auto_rp.c
@@ -4,7 +4,7 @@
  *
  * Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-auto_rp.c,v 1.22 2002/08/28 21:00:07 jmayer Exp $
+ * $Id: packet-auto_rp.c,v 1.23 2003/01/31 03:17:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -207,7 +207,7 @@ void proto_register_auto_rp(void)
 
                 { &hf_auto_rp_mask_len,
                   {"Mask length", "auto_rp.mask_len",
-                   FT_UINT8, BASE_BIN, NULL, 0x0,
+                   FT_UINT8, BASE_DEC, NULL, 0x0,
                    "Length of group prefix", HFILL }},
 
                 { &hf_auto_rp_group_prefix,
diff --git a/packet-cpha.c b/packet-cpha.c
index 1bcb165e78..c32962b306 100644
--- a/packet-cpha.c
+++ b/packet-cpha.c
@@ -2,7 +2,7 @@
  * Routines for the Check Point High-Availability Protocol (CPHAP)
  * Copyright 2002, Yaniv Kaul <ykaul-at-netvision.net.il>
  *
- * $Id: packet-cpha.c,v 1.4 2002/08/28 21:00:08 jmayer Exp $
+ * $Id: packet-cpha.c,v 1.5 2003/01/31 03:17:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -515,7 +515,7 @@ proto_register_cpha(void)
     { &hf_id_num,
     { "Number of IDs reported", "cphap.id_num", FT_UINT16, BASE_DEC, NULL, 0x0, "Number of IDs reported", HFILL}},
     { &hf_report_code,
-    { "Report code", "cphap.id_num", FT_UINT16, BASE_BIN, NULL, 0x0, "Report Code", HFILL}},
+    { "Report code", "cphap.id_num", FT_UINT16, BASE_DEC, NULL, 0x0, "Report Code", HFILL}},
     { &hf_ha_mode,
     { "HA mode", "cphap.ha_mode", FT_UINT16, BASE_DEC, NULL, 0x0, "HA Mode", HFILL}},
     { &hf_ha_time_unit,
diff --git a/packet-dccp.c b/packet-dccp.c
index ec4c2b9a21..e321692894 100644
--- a/packet-dccp.c
+++ b/packet-dccp.c
@@ -4,7 +4,7 @@
  *
  * Copyright 1999, Nathan Neulinger <nneul@umr.edu>
  *
- * $Id: packet-dccp.c,v 1.9 2003/01/27 22:44:01 deniel Exp $
+ * $Id: packet-dccp.c,v 1.10 2003/01/31 03:17:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -509,32 +509,32 @@ proto_register_dccp(void)
 				NULL, 0, "Trace Bits", HFILL }},
 
 			{ &hf_dccp_trace_admin, {
-				"Admin Requests", "dccp.trace.admin", FT_UINT32, BASE_BIN,
-				NULL, 0x0001, "Admin Requests", HFILL }},
+				"Admin Requests", "dccp.trace.admin", FT_BOOLEAN, 32,
+				NULL, 0x00000001, "Admin Requests", HFILL }},
 
 			{ &hf_dccp_trace_anon, {
-				"Anonymous Requests", "dccp.trace.anon", FT_UINT32, BASE_BIN,
-				NULL, 0x0002, "Anonymous Requests", HFILL }},
+				"Anonymous Requests", "dccp.trace.anon", FT_BOOLEAN, 32,
+				NULL, 0x00000002, "Anonymous Requests", HFILL }},
 
 			{ &hf_dccp_trace_client, {
-				"Authenticated Client Requests", "dccp.trace.client", FT_UINT32, BASE_BIN,
-				NULL, 0x0004, "Authenticated Client Requests", HFILL }},
+				"Authenticated Client Requests", "dccp.trace.client", FT_BOOLEAN, 32,
+				NULL, 0x00000004, "Authenticated Client Requests", HFILL }},
 
 			{ &hf_dccp_trace_rlim, {
-				"Rate-Limited Requests", "dccp.trace.rlim", FT_UINT32, BASE_BIN,
-				NULL, 0x0008, "Rate-Limited Requests", HFILL }},
+				"Rate-Limited Requests", "dccp.trace.rlim", FT_BOOLEAN, 32,
+				NULL, 0x00000008, "Rate-Limited Requests", HFILL }},
 
 			{ &hf_dccp_trace_query, {
-				"Queries and Reports", "dccp.trace.query", FT_UINT32, BASE_BIN,
-				NULL, 0x0010, "Queries and Reports", HFILL }},
+				"Queries and Reports", "dccp.trace.query", FT_BOOLEAN, 32,
+				NULL, 0x00000010, "Queries and Reports", HFILL }},
 
 			{ &hf_dccp_trace_ridc, {
-				"RID Cache Messages", "dccp.trace.ridc", FT_UINT32, BASE_BIN,
-				NULL, 0x0020, "RID Cache Messages", HFILL }},
+				"RID Cache Messages", "dccp.trace.ridc", FT_BOOLEAN, 32,
+				NULL, 0x00000020, "RID Cache Messages", HFILL }},
 
 			{ &hf_dccp_trace_flood, {
-				"Input/Output Flooding", "dccp.trace.flood", FT_UINT32, BASE_BIN,
-				NULL, 0x0040, "Input/Output Flooding", HFILL }},
+				"Input/Output Flooding", "dccp.trace.flood", FT_BOOLEAN, 32,
+				NULL, 0x00000040, "Input/Output Flooding", HFILL }},
 
 			{ &hf_dccp_floodop, {
 				"Flood Control Operation", "dccp.floodop", FT_UINT32, BASE_DEC,
diff --git a/packet-fcels.c b/packet-fcels.c
index 1779048642..32397ab079 100644
--- a/packet-fcels.c
+++ b/packet-fcels.c
@@ -2,7 +2,7 @@
  * Routines for FC Extended Link Services
  * Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
  *
- * $Id: packet-fcels.c,v 1.3 2003/01/22 06:26:33 guy Exp $
+ * $Id: packet-fcels.c,v 1.4 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1847,7 +1847,7 @@ proto_register_fcels (void)
           {"Registration Function", "fcels.scr.regn", FT_UINT8, BASE_HEX,
            VALS (fc_els_scr_reg_val), 0x0, "", HFILL}},
         { &hf_fcels_farp_matchcodept,
-          {"Match Address Code Points", "fcels.matchcp", FT_UINT8, BASE_BIN,
+          {"Match Address Code Points", "fcels.matchcp", FT_UINT8, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_fcels_farp_respaction,
           {"Responder Action", "fcels.respaction", FT_UINT8, BASE_HEX, 
diff --git a/packet-fcp.c b/packet-fcp.c
index 7dac211fb9..fe7ce0fb27 100644
--- a/packet-fcp.c
+++ b/packet-fcp.c
@@ -2,7 +2,7 @@
  * Routines for Fibre Channel Protocol for SCSI (FCP)
  * Copyright 2001, Dinesh G Dutt <ddutt@cisco.com>
  *
- * $Id: packet-fcp.c,v 1.1 2002/12/08 02:32:17 gerald Exp $
+ * $Id: packet-fcp.c,v 1.2 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -457,7 +457,7 @@ dissect_fcp_rsp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                             offset, 0, cdata->fcp_lun);
         }
         proto_tree_add_uint_format (fcp_tree, hf_fcp_rspflags, tvb, offset+10,
-                                    1, flags, "Flags: 0x%x (%s)", flags,
+                                    1, flags, "Flags: 0x%02x (%s)", flags,
                                     rspflags_to_str (flags, str));
         proto_tree_add_item (fcp_tree, hf_fcp_scsistatus, tvb, offset+11, 1, 0);
         if (flags & 0xC)
@@ -624,9 +624,9 @@ proto_register_fcp (void)
           {"Additional CDB Length", "fcp.addlcdblen", FT_UINT8, BASE_DEC, NULL,
            0xFC, "", HFILL}},
         { &hf_fcp_rddata,
-          {"RDDATA", "fcp.rddata", FT_UINT8, BASE_BIN, NULL, 0x2, "", HFILL}},
+          {"RDDATA", "fcp.rddata", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
         { &hf_fcp_wrdata,
-          {"WRDATA", "fcp.wrdata", FT_UINT8, BASE_BIN, NULL, 0x1, "", HFILL}},
+          {"WRDATA", "fcp.wrdata", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
         { &hf_fcp_dl,
           {"FCP_DL", "fcp.dl", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
         { &hf_fcp_data_ro,
@@ -636,7 +636,7 @@ proto_register_fcp (void)
           {"Burst Length", "fcp.burstlen", FT_UINT32, BASE_DEC, NULL, 0x0, "",
            HFILL}},
         { &hf_fcp_rspflags,
-          {"FCP_RSP Flags", "fcp.rspflags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"FCP_RSP Flags", "fcp.rspflags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_fcp_resid,
           {"FCP_RESID", "fcp.resid", FT_UINT32, BASE_DEC, NULL, 0x0, "",
diff --git a/packet-mtp3mg.c b/packet-mtp3mg.c
index 28cce91e80..e8a4634c53 100644
--- a/packet-mtp3mg.c
+++ b/packet-mtp3mg.c
@@ -8,7 +8,7 @@
  *
  * Copyright 2003, Jeff Morriss <jeff.morriss[AT]ulticom.com>
  *
- * $Id: packet-mtp3mg.c,v 1.2 2003/01/06 02:18:15 guy Exp $
+ * $Id: packet-mtp3mg.c,v 1.3 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -965,43 +965,43 @@ proto_register_mtp3mg(void)
     static hf_register_info hf[] = {
 	{ &hf_mtp3mg_h0,
 	    { "H0 (Message Group)", "mtp3mg.h0",
-	      FT_UINT8, BASE_BIN, VALS(h0_message_type_values), H0_MASK,
+	      FT_UINT8, BASE_HEX, VALS(h0_message_type_values), H0_MASK,
 	      "Message group identifier", HFILL }},
 	{ &hf_mtp3mg_chm_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(chm_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(chm_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_ecm_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(ecm_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(ecm_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_fcm_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(fcm_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(fcm_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_tfm_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(tfm_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(tfm_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_rsm_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(rsm_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(rsm_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_mim_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(mim_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(mim_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_trm_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(trm_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(trm_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_dlm_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(dlm_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(dlm_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_ufc_h1,
 	    { "H1 (Message)", "mtp3mg.h1",
-	      FT_UINT8, BASE_BIN, VALS(ufc_h1_message_type_values), H1_MASK,
+	      FT_UINT8, BASE_HEX, VALS(ufc_h1_message_type_values), H1_MASK,
 	      "Message type", HFILL }},
 	{ &hf_mtp3mg_coo_ansi_slc,
 	    { "Signalling Link Code", "mtp3mg.slc",
diff --git a/packet-rx.c b/packet-rx.c
index e9040b170c..6993c1b55c 100644
--- a/packet-rx.c
+++ b/packet-rx.c
@@ -4,7 +4,7 @@
  * Based on routines from tcpdump patches by
  *   Ken Hornstein <kenh@cmf.nrl.navy.mil>
  *
- * $Id: packet-rx.c,v 1.37 2002/08/28 21:00:30 jmayer Exp $
+ * $Id: packet-rx.c,v 1.38 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -57,16 +57,6 @@ static const value_string rx_types[] = {
 	{ 0,				NULL },
 };
 
-static const value_string rx_flags[] = {
-	{ RX_CLIENT_INITIATED,	"client-init" },
-	{ RX_REQUEST_ACK,	"req-ack" },
-	{ RX_LAST_PACKET,	"last-pckt" },
-	{ RX_MORE_PACKETS,	"more-pckts" },
-	{ RX_FREE_PACKET,	"free-pckt" },
-	{ RX_SLOW_START_OR_JUMBO, "slow-start/jumbogram" },
-	{ 0,                    NULL }
-};
-
 static const value_string rx_reason[] = {
 	{ RX_ACK_REQUESTED,		"Ack Requested"		},
 	{ RX_ACK_DUPLICATE,		"Duplicate Packet"	},
@@ -437,15 +427,15 @@ dissect_rx_flags(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *parent_tree,
 		offset, 1, flags);
 	tree = proto_item_add_subtree(item, ett_rx_flags);
 
-	proto_tree_add_uint(tree, hf_rx_flags_free_packet, tvb,
+	proto_tree_add_boolean(tree, hf_rx_flags_free_packet, tvb,
 		offset, 1, flags);
-	proto_tree_add_uint(tree, hf_rx_flags_more_packets, tvb,
+	proto_tree_add_boolean(tree, hf_rx_flags_more_packets, tvb,
 		offset, 1, flags);
-	proto_tree_add_uint(tree, hf_rx_flags_last_packet, tvb,
+	proto_tree_add_boolean(tree, hf_rx_flags_last_packet, tvb,
 		offset, 1, flags);
-	proto_tree_add_uint(tree, hf_rx_flags_request_ack, tvb,
+	proto_tree_add_boolean(tree, hf_rx_flags_request_ack, tvb,
 		offset, 1, flags);
-	proto_tree_add_uint(tree, hf_rx_flags_clientinit, tvb,
+	proto_tree_add_boolean(tree, hf_rx_flags_clientinit, tvb,
 		offset, 1, flags);
 
 	offset += 1;
@@ -617,25 +607,27 @@ proto_register_rx(void)
 			NULL, 0, "Flags", HFILL }},
 
 		{ &hf_rx_flags_clientinit, {
-			"Client Initiated", "rx.flags.client_init", FT_UINT8, BASE_BIN,
+			"Client Initiated", "rx.flags.client_init", FT_BOOLEAN, 8,
 			NULL, RX_CLIENT_INITIATED, "Client Initiated", HFILL }},
 
 		{ &hf_rx_flags_request_ack, {
-			"Request Ack", "rx.flags.request_ack", FT_UINT8, BASE_BIN,
+			"Request Ack", "rx.flags.request_ack", FT_BOOLEAN, 8,
 			NULL, RX_REQUEST_ACK, "Request Ack", HFILL }},
 
 		{ &hf_rx_flags_last_packet, {
-			"Last Packet", "rx.flags.last_packet", FT_UINT8, BASE_BIN,
+			"Last Packet", "rx.flags.last_packet", FT_BOOLEAN, 8,
 			NULL, RX_LAST_PACKET, "Last Packet", HFILL }},
 
 		{ &hf_rx_flags_more_packets, {
-			"More Packets", "rx.flags.more_packets", FT_UINT8, BASE_BIN,
+			"More Packets", "rx.flags.more_packets", FT_BOOLEAN, 8,
 			NULL, RX_MORE_PACKETS, "More Packets", HFILL }},
 
 		{ &hf_rx_flags_free_packet, {
-			"Free Packet", "rx.flags.free_packet", FT_UINT8, BASE_BIN,
+			"Free Packet", "rx.flags.free_packet", FT_BOOLEAN, 8,
 			NULL, RX_FREE_PACKET, "Free Packet", HFILL }},
 
+		/* XXX - what about RX_SLOW_START_OR_JUMBO? */
+
 		{ &hf_rx_userstatus, {
 			"User Status", "rx.userstatus", FT_UINT32, BASE_DEC,
 			NULL, 0, "User Status", HFILL }},
diff --git a/packet-scsi.c b/packet-scsi.c
index d6d7322ec0..8417dc6bea 100644
--- a/packet-scsi.c
+++ b/packet-scsi.c
@@ -2,7 +2,7 @@
  * Routines for decoding SCSI CDBs and responses
  * Author: Dinesh G Dutt (ddutt@cisco.com)
  *
- * $Id: packet-scsi.c,v 1.22 2002/12/02 23:43:29 guy Exp $
+ * $Id: packet-scsi.c,v 1.23 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -4801,7 +4801,7 @@ proto_register_scsi (void)
           {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_inquiry_flags,
-          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_inquiry_evpd_page,
           {"EVPD Page Code", "scsi.inquiry.evpd.pagecode", FT_UINT8, BASE_HEX,
@@ -4813,16 +4813,16 @@ proto_register_scsi (void)
           {"Allocation Length", "scsi.cdb.alloclen", FT_UINT8, BASE_DEC, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_logsel_flags,
-          {"Flags", "scsi.logsel.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.logsel.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_log_pc,
-          {"Page Control", "scsi.log.pc", FT_UINT8, BASE_BIN,
+          {"Page Control", "scsi.log.pc", FT_UINT8, BASE_DEC,
            VALS (scsi_logsel_pc_val), 0xC0, "", HFILL}},
         { &hf_scsi_paramlen,
           {"Parameter Length", "scsi.cdb.paramlen", FT_UINT8, BASE_DEC, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_logsns_flags,
-          {"Flags", "scsi.logsns.flags", FT_UINT16, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.logsns.flags", FT_UINT16, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_logsns_pagecode,
           {"Page Code", "scsi.logsns.pagecode", FT_UINT8, BASE_HEX,
@@ -4831,13 +4831,13 @@ proto_register_scsi (void)
           {"Parameter Length", "scsi.cdb.paramlen16", FT_UINT16, BASE_DEC, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_modesel_flags,
-          {"Mode Sense/Select Flags", "scsi.cdb.mode.flags", FT_UINT8, BASE_BIN,
+          {"Mode Sense/Select Flags", "scsi.cdb.mode.flags", FT_UINT8, BASE_HEX,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_alloclen16,
           {"Allocation Length", "scsi.cdb.alloclen16", FT_UINT16, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_modesns_pc,
-          {"Page Control", "scsi.mode.pc", FT_UINT8, BASE_BIN,
+          {"Page Control", "scsi.mode.pc", FT_UINT8, BASE_DEC,
            VALS (scsi_modesns_pc_val), 0xC0, "", HFILL}},
         { &hf_scsi_spcpagecode,
           {"SPC-2 Page Code", "scsi.mode.spc.pagecode", FT_UINT8, BASE_HEX,
@@ -4867,7 +4867,7 @@ proto_register_scsi (void)
           {"Reservation Type", "scsi.persresv.type", FT_UINT8, BASE_HEX,
            VALS (scsi_persresv_type_val), 0x0F, "", HFILL}},
         { &hf_scsi_release_flags,
-          {"Release Flags", "scsi.release.flags", FT_UINT8, BASE_BIN, NULL,
+          {"Release Flags", "scsi.release.flags", FT_UINT8, BASE_HEX, NULL,
            0x0, "", HFILL}},
         { &hf_scsi_release_thirdpartyid,
           {"Third-Party ID", "scsi.release.thirdpartyid", FT_BYTES, BASE_HEX,
@@ -4876,10 +4876,10 @@ proto_register_scsi (void)
           {"Allocation Length", "scsi.cdb.alloclen32", FT_UINT32, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_formatunit_flags,
-          {"Flags", "scsi.formatunit.flags", FT_UINT8, BASE_BIN, NULL, 0xF8,
+          {"Flags", "scsi.formatunit.flags", FT_UINT8, BASE_HEX, NULL, 0xF8,
            "", HFILL}},
         { &hf_scsi_cdb_defectfmt,
-          {"Defect List Format", "scsi.cdb.defectfmt", FT_UINT8, BASE_BIN,
+          {"Defect List Format", "scsi.cdb.defectfmt", FT_UINT8, BASE_DEC,
            NULL, 0x7, "", HFILL}},
         { &hf_scsi_formatunit_interleave,
           {"Interleave", "scsi.formatunit.interleave", FT_UINT16, BASE_HEX,
@@ -4909,19 +4909,19 @@ proto_register_scsi (void)
           {"Logical Block Address (LBA)", "scsi.rdwr16.lba", FT_BYTES, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_readcapacity_flags,
-          {"Flags", "scsi.readcapacity.flags", FT_UINT8, BASE_BIN, NULL, 0x0,
+          {"Flags", "scsi.readcapacity.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
            "", HFILL}},
         { &hf_scsi_readcapacity_lba,
           {"Logical Block Address", "scsi.readcapacity.lba", FT_UINT32, BASE_DEC,
            NULL, 0x0, "", HFILL}},
         { &hf_scsi_readcapacity_pmi,
-          {"PMI", "scsi.readcapacity.pmi", FT_UINT8, BASE_BIN, NULL, 0x1, "",
+          {"PMI", "scsi.readcapacity.pmi", FT_UINT8, BASE_DEC, NULL, 0x1, "",
            HFILL}},
         { &hf_scsi_readdefdata_flags,
-          {"Flags", "scsi.readdefdata.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.readdefdata.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_reassignblks_flags,
-          {"Flags", "scsi.reassignblks.flags", FT_UINT8, BASE_BIN, NULL, 0x0, "",
+          {"Flags", "scsi.reassignblks.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
            HFILL}},
         { &hf_scsi_inq_devtype,
           {"Device Type", "scsi.inquiry.devtype", FT_UINT8, BASE_HEX,
@@ -4942,7 +4942,7 @@ proto_register_scsi (void)
           {"MRIE", "scsi.mode.mrie", FT_UINT8, BASE_HEX,
            VALS (scsi_modesns_mrie_val), 0x0F, "", HFILL}},
         { &hf_scsi_modesns_tst,
-          {"Task Set Type", "scsi.mode.tst", FT_UINT8, BASE_BIN,
+          {"Task Set Type", "scsi.mode.tst", FT_UINT8, BASE_DEC,
            VALS (scsi_modesns_tst_val), 0xE0, "", HFILL}},
         { &hf_scsi_modesns_qmod,
           {"Queue Algorithm Modifier", "scsi.mode.qmod", FT_UINT8, BASE_HEX,
diff --git a/packet-sctp.c b/packet-sctp.c
index c164275356..20c927ee2d 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -11,7 +11,7 @@
  * - support for reassembly
  * - code cleanup
  *
- * $Id: packet-sctp.c,v 1.50 2003/01/20 22:46:27 tuexen Exp $
+ * $Id: packet-sctp.c,v 1.51 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2279,7 +2279,7 @@ proto_register_sctp(void)
     },
     { &hf_sctp_chunk_flags,
       { "Flags", "sctp.chunk_flags",
-	FT_UINT8, BASE_BIN, NULL, 0x0,
+	FT_UINT8, BASE_HEX, NULL, 0x0,
 	"", HFILL }
     },
     { &hf_sctp_chunk_length,
diff --git a/packet-tns.c b/packet-tns.c
index 0b01bd6d71..e132bc9f94 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.37 2003/01/11 09:57:16 guy Exp $
+ * $Id: packet-tns.c,v 1.38 2003/01/31 03:17:46 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1018,37 +1018,37 @@ void proto_register_tns(void)
 			NULL, 0x0, "Service Options", HFILL }},
 
 		{ &hf_tns_sopt_flag_bconn, {
-			"Broken Connect Notify", "tns.so_flag.bconn", FT_UINT16, BASE_BIN,
+			"Broken Connect Notify", "tns.so_flag.bconn", FT_BOOLEAN, 16,
 			NULL, 0x2000, "Broken Connect Notify", HFILL }},
 		{ &hf_tns_sopt_flag_pc, {
-			"Packet Checksum", "tns.so_flag.pc", FT_UINT16, BASE_BIN,
+			"Packet Checksum", "tns.so_flag.pc", FT_BOOLEAN, 16,
 			NULL, 0x1000, "Packet Checksum", HFILL }},
 		{ &hf_tns_sopt_flag_hc, {
-			"Header Checksum", "tns.so_flag.hc", FT_UINT16, BASE_BIN,
+			"Header Checksum", "tns.so_flag.hc", FT_BOOLEAN, 16,
 			NULL, 0x0800, "Header Checksum", HFILL }},
 		{ &hf_tns_sopt_flag_fd, {
-			"Full Duplex", "tns.so_flag.fd", FT_UINT16, BASE_BIN,
+			"Full Duplex", "tns.so_flag.fd", FT_BOOLEAN, 16,
 			NULL, 0x0400, "Full Duplex", HFILL }},
 		{ &hf_tns_sopt_flag_hd, {
-			"Half Duplex", "tns.so_flag.hd", FT_UINT16, BASE_BIN,
+			"Half Duplex", "tns.so_flag.hd", FT_BOOLEAN, 16,
 			NULL, 0x0200, "Half Duplex", HFILL }},
 		{ &hf_tns_sopt_flag_dc1, {
-			"Don't Care", "tns.so_flag.dc1", FT_UINT16, BASE_BIN,
+			"Don't Care", "tns.so_flag.dc1", FT_BOOLEAN, 16,
 			NULL, 0x0100, "Don't Care", HFILL }},
 		{ &hf_tns_sopt_flag_dc2, {
-			"Don't Care", "tns.so_flag.dc2", FT_UINT16, BASE_BIN,
+			"Don't Care", "tns.so_flag.dc2", FT_BOOLEAN, 16,
 			NULL, 0x0080, "Don't Care", HFILL }},
 		{ &hf_tns_sopt_flag_dio, {
-			"Direct IO to Transport", "tns.so_flag.dio", FT_UINT16, BASE_BIN,
+			"Direct IO to Transport", "tns.so_flag.dio", FT_BOOLEAN, 16,
 			NULL, 0x0010, "Direct IO to Transport", HFILL }},
 		{ &hf_tns_sopt_flag_ap, {
-			"Attention Processing", "tns.so_flag.ap", FT_UINT16, BASE_BIN,
+			"Attention Processing", "tns.so_flag.ap", FT_BOOLEAN, 16,
 			NULL, 0x0008, "Attention Processing", HFILL }},
 		{ &hf_tns_sopt_flag_ra, {
-			"Can Receive Attention", "tns.so_flag.ra", FT_UINT16, BASE_BIN,
+			"Can Receive Attention", "tns.so_flag.ra", FT_BOOLEAN, 16,
 			NULL, 0x0004, "Can Receive Attention", HFILL }},
 		{ &hf_tns_sopt_flag_sa, {
-			"Can Send Attention", "tns.so_flag.sa", FT_UINT16, BASE_BIN,
+			"Can Send Attention", "tns.so_flag.sa", FT_BOOLEAN, 16,
 			NULL, 0x0002, "Can Send Attention", HFILL }},
 
 
@@ -1063,52 +1063,52 @@ void proto_register_tns(void)
 			"NT Protocol Characteristics", "tns.nt_proto_characteristics", FT_UINT16, BASE_HEX,
 			NULL, 0x0, "NT Protocol Characteristics", HFILL }},
 		{ &hf_tns_ntp_flag_hangon, {
-			"Hangon to listener connect", "tns.ntp_flag.hangon", FT_UINT16, BASE_BIN,
+			"Hangon to listener connect", "tns.ntp_flag.hangon", FT_BOOLEAN, 16,
 			NULL, 0x8000, "Hangon to listener connect", HFILL }},
 		{ &hf_tns_ntp_flag_crel, {
-			"Confirmed release", "tns.ntp_flag.crel", FT_UINT16, BASE_BIN,
+			"Confirmed release", "tns.ntp_flag.crel", FT_BOOLEAN, 16,
 			NULL, 0x4000, "Confirmed release", HFILL }},
 		{ &hf_tns_ntp_flag_tduio, {
-			"TDU based IO", "tns.ntp_flag.tduio", FT_UINT16, BASE_BIN,
+			"TDU based IO", "tns.ntp_flag.tduio", FT_BOOLEAN, 16,
 			NULL, 0x2000, "TDU based IO", HFILL }},
 		{ &hf_tns_ntp_flag_srun, {
-			"Spawner running", "tns.ntp_flag.srun", FT_UINT16, BASE_BIN,
+			"Spawner running", "tns.ntp_flag.srun", FT_BOOLEAN, 16,
 			NULL, 0x1000, "Spawner running", HFILL }},
 		{ &hf_tns_ntp_flag_dtest, {
-			"Data test", "tns.ntp_flag.dtest", FT_UINT16, BASE_BIN,
+			"Data test", "tns.ntp_flag.dtest", FT_BOOLEAN, 16,
 			NULL, 0x0800, "Data Test", HFILL }},
 		{ &hf_tns_ntp_flag_cbio, {
-			"Callback IO supported", "tns.ntp_flag.cbio", FT_UINT16, BASE_BIN,
+			"Callback IO supported", "tns.ntp_flag.cbio", FT_BOOLEAN, 16,
 			NULL, 0x0400, "Callback IO supported", HFILL }},
 		{ &hf_tns_ntp_flag_asio, {
-			"ASync IO Supported", "tns.ntp_flag.asio", FT_UINT16, BASE_BIN,
+			"ASync IO Supported", "tns.ntp_flag.asio", FT_BOOLEAN, 16,
 			NULL, 0x0200, "ASync IO Supported", HFILL }},
 		{ &hf_tns_ntp_flag_pio, {
-			"Packet oriented IO", "tns.ntp_flag.pio", FT_UINT16, BASE_BIN,
+			"Packet oriented IO", "tns.ntp_flag.pio", FT_BOOLEAN, 16,
 			NULL, 0x0100, "Packet oriented IO", HFILL }},
 		{ &hf_tns_ntp_flag_grant, {
-			"Can grant connection to another", "tns.ntp_flag.grant", FT_UINT16, BASE_BIN,
+			"Can grant connection to another", "tns.ntp_flag.grant", FT_BOOLEAN, 16,
 			NULL, 0x0080, "Can grant connection to another", HFILL }},
 		{ &hf_tns_ntp_flag_handoff, {
-			"Can handoff connection to another", "tns.ntp_flag.handoff", FT_UINT16, BASE_BIN,
+			"Can handoff connection to another", "tns.ntp_flag.handoff", FT_BOOLEAN, 16,
 			NULL, 0x0040, "Can handoff connection to another", HFILL }},
 		{ &hf_tns_ntp_flag_sigio, {
-			"Generate SIGIO signal", "tns.ntp_flag.sigio", FT_UINT16, BASE_BIN,
+			"Generate SIGIO signal", "tns.ntp_flag.sigio", FT_BOOLEAN, 16,
 			NULL, 0x0020, "Generate SIGIO signal", HFILL }},
 		{ &hf_tns_ntp_flag_sigpipe, {
-			"Generate SIGPIPE signal", "tns.ntp_flag.sigpipe", FT_UINT16, BASE_BIN,
+			"Generate SIGPIPE signal", "tns.ntp_flag.sigpipe", FT_BOOLEAN, 16,
 			NULL, 0x0010, "Generate SIGPIPE signal", HFILL }},
 		{ &hf_tns_ntp_flag_sigurg, {
-			"Generate SIGURG signal", "tns.ntp_flag.sigurg", FT_UINT16, BASE_BIN,
+			"Generate SIGURG signal", "tns.ntp_flag.sigurg", FT_BOOLEAN, 16,
 			NULL, 0x0008, "Generate SIGURG signal", HFILL }},
 		{ &hf_tns_ntp_flag_urgentio, {
-			"Urgent IO supported", "tns.ntp_flag.urgentio", FT_UINT16, BASE_BIN,
+			"Urgent IO supported", "tns.ntp_flag.urgentio", FT_BOOLEAN, 16,
 			NULL, 0x0004, "Urgent IO supported", HFILL }},
 		{ &hf_tns_ntp_flag_fdio, {
-			"Full duplex IO supported", "tns.ntp_flag.dfio", FT_UINT16, BASE_BIN,
+			"Full duplex IO supported", "tns.ntp_flag.dfio", FT_BOOLEAN, 16,
 			NULL, 0x0002, "Full duplex IO supported", HFILL }},
 		{ &hf_tns_ntp_flag_testop, {
-			"Test operation", "tns.ntp_flag.testop", FT_UINT16, BASE_BIN,
+			"Test operation", "tns.ntp_flag.testop", FT_BOOLEAN, 16,
 			NULL, 0x0001, "Test operation", HFILL }},
 
 
@@ -1142,19 +1142,19 @@ void proto_register_tns(void)
 			NULL, 0x0, "Connect Flags 1", HFILL }},
 
 		{ &hf_tns_conn_flag_nareq, {
-			"NA services required", "tns.connect_flags.nareq", FT_UINT8, BASE_BIN,
+			"NA services required", "tns.connect_flags.nareq", FT_BOOLEAN, 8,
 			NULL, 0x10, "NA services required", HFILL }},
 		{ &hf_tns_conn_flag_nalink, {
-			"NA services linked in", "tns.connect_flags.nalink", FT_UINT8, BASE_BIN,
+			"NA services linked in", "tns.connect_flags.nalink", FT_BOOLEAN, 8,
 			NULL, 0x08, "NA services linked in", HFILL }},
 		{ &hf_tns_conn_flag_enablena, {
-			"NA services enabled", "tns.connect_flags.enablena", FT_UINT8, BASE_BIN,
+			"NA services enabled", "tns.connect_flags.enablena", FT_BOOLEAN, 8,
 			NULL, 0x04, "NA services enabled", HFILL }},
 		{ &hf_tns_conn_flag_ichg, {
-			"Interchange is involved", "tns.connect_flags.ichg", FT_UINT8, BASE_BIN,
+			"Interchange is involved", "tns.connect_flags.ichg", FT_BOOLEAN, 8,
 			NULL, 0x02, "Interchange is involved", HFILL }},
 		{ &hf_tns_conn_flag_wantna, {
-			"NA services wanted", "tns.connect_flags.wantna", FT_UINT8, BASE_BIN,
+			"NA services wanted", "tns.connect_flags.wantna", FT_BOOLEAN, 8,
 			NULL, 0x01, "NA services wanted", HFILL }},
 
 
@@ -1255,31 +1255,31 @@ void proto_register_tns(void)
 			"Data Flag", "tns.data_flag", FT_UINT16, BASE_HEX,
 			NULL, 0x0, "Data Flag", HFILL }},
 		{ &hf_tns_data_flag_send, {
-			"Send Token", "tns.data_flag.send", FT_UINT16, BASE_BIN,
+			"Send Token", "tns.data_flag.send", FT_BOOLEAN, 16,
 			NULL, 0x1, "Send Token", HFILL }},
 		{ &hf_tns_data_flag_rc, {
-			"Request Confirmation", "tns.data_flag.rc", FT_UINT16, BASE_BIN,
+			"Request Confirmation", "tns.data_flag.rc", FT_BOOLEAN, 16,
 			NULL, 0x2, "Request Confirmation", HFILL }},
 		{ &hf_tns_data_flag_c, {
-			"Confirmation", "tns.data_flag.c", FT_UINT16, BASE_BIN,
+			"Confirmation", "tns.data_flag.c", FT_BOOLEAN, 16,
 			NULL, 0x4, "Confirmation", HFILL }},
 		{ &hf_tns_data_flag_reserved, {
-			"Reserved", "tns.data_flag.reserved", FT_UINT16, BASE_BIN,
+			"Reserved", "tns.data_flag.reserved", FT_BOOLEAN, 16,
 			NULL, 0x8, "Reserved", HFILL }},
 		{ &hf_tns_data_flag_more, {
-			"More Data to Come", "tns.data_flag.more", FT_UINT16, BASE_BIN,
+			"More Data to Come", "tns.data_flag.more", FT_BOOLEAN, 16,
 			NULL, 0x20, "More Data to Come", HFILL }},
 		{ &hf_tns_data_flag_eof, {
-			"End of File", "tns.data_flag.eof", FT_UINT16, BASE_BIN,
+			"End of File", "tns.data_flag.eof", FT_BOOLEAN, 16,
 			NULL, 0x40, "End of File", HFILL }},
 		{ &hf_tns_data_flag_dic, {
-			"Do Immediate Confirmation", "tns.data_flag.dic", FT_UINT16, BASE_BIN,
+			"Do Immediate Confirmation", "tns.data_flag.dic", FT_BOOLEAN, 16,
 			NULL, 0x80, "Do Immediate Confirmation", HFILL }},
 		{ &hf_tns_data_flag_rts, {
-			"Request To Send", "tns.data_flag.rts", FT_UINT16, BASE_BIN,
+			"Request To Send", "tns.data_flag.rts", FT_BOOLEAN, 16,
 			NULL, 0x100, "Request To Send", HFILL }},
 		{ &hf_tns_data_flag_sntt, {
-			"Send NT Trailer", "tns.data_flag.sntt", FT_UINT16, BASE_BIN,
+			"Send NT Trailer", "tns.data_flag.sntt", FT_BOOLEAN, 16,
 			NULL, 0x200, "Send NT Trailer", HFILL }},
 
 
diff --git a/packet-vlan.c b/packet-vlan.c
index 433cde5659..cfc6bb1a0e 100644
--- a/packet-vlan.c
+++ b/packet-vlan.c
@@ -1,7 +1,7 @@
 /* packet-vlan.c
  * Routines for VLAN 802.1Q ethernet header disassembly
  *
- * $Id: packet-vlan.c,v 1.41 2002/08/28 21:00:36 jmayer Exp $
+ * $Id: packet-vlan.c,v 1.42 2003/01/31 03:17:47 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -128,13 +128,13 @@ proto_register_vlan(void)
 {
   static hf_register_info hf[] = {
 	{ &hf_vlan_priority, {
-		"Priority", "vlan.priority", FT_UINT16, BASE_BIN,
+		"Priority", "vlan.priority", FT_UINT16, BASE_DEC,
 		0, 0xE000, "Priority", HFILL }},
 	{ &hf_vlan_cfi, {
-		"CFI", "vlan.cfi", FT_UINT16, BASE_BIN,
+		"CFI", "vlan.cfi", FT_UINT16, BASE_DEC,
 		0, 0x1000, "CFI", HFILL }},	/* XXX - Boolean? */
 	{ &hf_vlan_id, {
-		"ID", "vlan.id", FT_UINT16, BASE_BIN,
+		"ID", "vlan.id", FT_UINT16, BASE_DEC,
 		0, 0x0FFF, "ID", HFILL }},
 	{ &hf_vlan_etype, {
 		"Type", "vlan.etype", FT_UINT16, BASE_HEX,
diff --git a/packet-wcp.c b/packet-wcp.c
index 19c69896c4..c714005d69 100644
--- a/packet-wcp.c
+++ b/packet-wcp.c
@@ -2,7 +2,7 @@
  * Routines for Wellfleet Compression frame disassembly
  * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-wcp.c,v 1.30 2002/11/08 01:00:04 guy Exp $
+ * $Id: packet-wcp.c,v 1.31 2003/01/31 03:17:47 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -702,7 +702,7 @@ proto_register_wcp(void)
 	  { "Compress Flag", "wcp.flag", FT_UINT8, BASE_HEX, NULL, 0,
 	  	"Compressed byte flag", HFILL }},
 	{ &hf_wcp_comp_marker,
-	  { "Compress Marker", "wcp.mark", FT_UINT8, BASE_BIN, NULL, 0,
+	  { "Compress Marker", "wcp.mark", FT_UINT8, BASE_DEC, NULL, 0,
 	  	"Compressed marker", HFILL }},
 	{ &hf_wcp_offset,
 	  { "Source offset", "wcp.off", FT_UINT16, BASE_HEX, NULL, WCP_OFFSET_MASK,
diff --git a/packet-x25.c b/packet-x25.c
index 234f1e7a06..863141f4e6 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
  * Routines for X.25 packet disassembly
  * Olivier Abad <oabad@noos.fr>
  *
- * $Id: packet-x25.c,v 1.75 2003/01/11 10:03:12 guy Exp $
+ * $Id: packet-x25.c,v 1.76 2003/01/31 03:17:47 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2222,7 +2222,7 @@ proto_register_x25(void)
 {
     static hf_register_info hf[] = {
 	{ &hf_x25_gfi,
-	  { "GFI", "x.25.gfi", FT_UINT16, BASE_BIN, NULL, 0xF000,
+	  { "GFI", "x.25.gfi", FT_UINT16, BASE_DEC, NULL, 0xF000,
 	  	"General format identifier", HFILL }},
 	{ &hf_x25_abit,
 	  { "A Bit", "x.25.a", FT_BOOLEAN, 16, NULL, 0x8000,
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 8724ee5109..918793cc13 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -2,7 +2,7 @@
  * Routines for docsis dissection
  * Copyright 2002, Anand V. Narwani <anarwani@cisco.com>
  *
- * $Id: packet-docsis.c,v 1.10 2002/09/10 19:07:38 guy Exp $
+ * $Id: packet-docsis.c,v 1.11 2003/01/31 03:17:56 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -595,22 +595,22 @@ proto_register_docsis (void)
   static hf_register_info hf[] = {
     {&hf_docsis_fctype,
      {"FCType", "docsis.fctype",
-      FT_UINT8, BASE_BIN, VALS (fctype_vals), 0xC0,
+      FT_UINT8, BASE_HEX, VALS (fctype_vals), 0xC0,
       "Frame Control Type", HFILL}
      },
     {&hf_docsis_fcparm,
      {"FCParm", "docsis.fcparm",
-      FT_UINT8, BASE_BIN, NULL, 0x3E,
+      FT_UINT8, BASE_DEC, NULL, 0x3E,
       "Parameter Field", HFILL}
      },
     {&hf_docsis_machdr_fcparm,
      {"FCParm", "docsis.fcparm",
-      FT_UINT8, BASE_BIN, VALS (fcparm_vals), 0x3E,
+      FT_UINT8, BASE_HEX, VALS (fcparm_vals), 0x3E,
       "Parameter Field", HFILL}
      },
     {&hf_docsis_ehdron,
      {"EHDRON", "docsis.ehdron",
-      FT_UINT8, BASE_BIN, VALS (ehdron_vals), 0x01,
+      FT_UINT8, BASE_HEX, VALS (ehdron_vals), 0x01,
       "Extended Header Presence", HFILL}
      },
     {&hf_docsis_macparm,
diff --git a/plugins/docsis/packet-tlv.c b/plugins/docsis/packet-tlv.c
index bf4fbe053a..2e708e11d0 100644
--- a/plugins/docsis/packet-tlv.c
+++ b/plugins/docsis/packet-tlv.c
@@ -2,7 +2,7 @@
  * Routines to Dissect Appendix C TLV's
  * Copyright 2002, Anand V. Narwani <anarwani@cisco.com>
  *
- * $Id: packet-tlv.c,v 1.9 2002/09/23 16:27:57 jmayer Exp $
+ * $Id: packet-tlv.c,v 1.10 2003/01/31 03:17:56 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -2541,7 +2541,7 @@ proto_register_docsis_tlv (void)
      },
     {&hf_docsis_tlv_sflow_qos_param,
      {".6 QOS Parameter Set", "docsis.tlv.sflow.qos",
-      FT_UINT8, BASE_BIN, VALS (qos_param_vals), 0x0,
+      FT_UINT8, BASE_HEX, VALS (qos_param_vals), 0x0,
       "QOS Parameter Set", HFILL}
      },
     {&hf_docsis_tlv_sflow_traf_pri,
diff --git a/x11-fields b/x11-fields
index 193ca48126..55f5ffbd47 100644
--- a/x11-fields
+++ b/x11-fields
@@ -3,7 +3,7 @@
 #
 # Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
 #
-# $Id: x11-fields,v 1.6 2002/04/17 08:33:09 guy Exp $
+# $Id: x11-fields,v 1.7 2003/01/31 03:17:47 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@ethereal.com>
@@ -63,7 +63,7 @@ bell-duration	INT16	DEC
 bell-percent	INT8	DEC
 bell-pitch	INT16	DEC
 bit-gravity	UINT8	DEC	VALS(gravity)
-bit-plane	UINT32	BIN
+bit-plane	UINT32	DEC
 blue		UINT16	DEC
 blues		UINT16	DEC
 border-pixel	UINT32	HEX
@@ -132,7 +132,7 @@ do-not-propagate-mask	UINT32	HEX
 	ButtonMotion		BOOLEAN 32	0x00002000
 	erroneous-bits		BOOLEAN 32	0xffffc0b0
 
-gc-dashes	UINT8	BIN
+gc-dashes	UINT8	DEC
 
 gc-value-mask	UINT32	HEX
 	function		BOOLEAN	32	0x00000001