Have "proto_register_protocol()" build a list of data structures for

protocols, in addition to adding structures to the list of filterable
fields.  Give it an extra argument that specifies a "short name" for the
protocol, for use in such places as

	pinfo->current_proto;

	the dialog box for constructing filters;

	the preferences tab for the protocol;

and so on (although we're not yet using it in all those places).

Make the preference name that appears in the preferences file and the
command line for the DIAMETER protocol "diameter", not "Diameter"; the
convention is that the name in question be all-lower-case.

Make some routines and variables that aren't exported static.

Update a comment in the ICP dissector to make it clear that the
dissector won't see fragments other than the first fragment of a
fragmented datagram.

svn path=/trunk/; revision=2810

148 files changed, 700 insertions, 469 deletions

diff --git a/epan/proto.c b/epan/proto.c
index 67fbc3e706..f9a48c278b 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,7 +1,7 @@
 /* proto.c
  * Routines for protocol tree
  *
- * $Id: proto.c,v 1.3 2000/11/13 07:19:29 guy Exp $
+ * $Id: proto.c,v 1.4 2001/01/03 06:55:58 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -115,19 +115,34 @@ static int proto_register_field_init(header_field_info *hfinfo, int parent);
 /* special-case header field used within proto.c */
 int hf_text_only = 1;
 
+/* Structure for information about a protocol */
+typedef struct {
+	char	*name;		/* long description */
+	char	*short_name;	/* short description */
+	char	*filter_name;	/* name of this protocol in filters */
+	int	proto_id;	/* field ID for this protocol */
+	GList	*fields;	/* fields for this protocol */
+	GList	*last_field;	/* pointer to end of list of fields */
+	gboolean is_enabled;	/* TRUE if protocol is enabled */
+	gboolean can_disable;	/* TRUE if protocol can be disabled */
+} protocol_t;
+
+/* List of all protocols */
+static GList *protocols;
+
 /* Contains information about protocols and header fields. Used when
  * dissectors register their data */
-GMemChunk *gmc_hfinfo = NULL;
+static GMemChunk *gmc_hfinfo = NULL;
 
 /* Contains information about a field when a dissector calls
  * proto_tree_add_item.  */
-GMemChunk *gmc_field_info = NULL;
+static GMemChunk *gmc_field_info = NULL;
 
 /* String space for protocol and field items for the GUI */
-GMemChunk *gmc_item_labels = NULL;
+static GMemChunk *gmc_item_labels = NULL;
 
 /* List which stores protocols and fields that have been registered */
-GPtrArray *gpa_hfinfo = NULL;
+static GPtrArray *gpa_hfinfo = NULL;
 
 /* Points to the first element of an array of Booleans, indexed by
    a subtree item type; that array element is TRUE if subtrees of
@@ -1466,59 +1481,168 @@ proto_item_add_subtree(proto_item *pi,  gint idx) {
 	return (proto_tree*) pi;
 }
 
+static gint
+proto_compare_name(gconstpointer p1_arg, gconstpointer p2_arg)
+{
+	const protocol_t *p1 = p1_arg;
+	const protocol_t *p2 = p2_arg;
+
+	return strcmp(p1->short_name, p2->short_name);
+}
 
 int
-proto_register_protocol(char *name, char *abbrev)
+proto_register_protocol(char *name, char *short_name, char *filter_name)
 {
+	protocol_t *protocol;
 	struct header_field_info *hfinfo;
+	int proto_id;
+
+	/* Add this protocol to the list of known protocols; the list
+	   is sorted by protocol short name. */
+	protocol = g_malloc(sizeof (protocol_t));
+	protocol->name = name;
+	protocol->short_name = short_name;
+	protocol->filter_name = filter_name;
+	protocol->fields = NULL;
+	protocol->is_enabled = TRUE; /* protocol is enabled by default */
+	protocol->can_disable = TRUE;
+	protocols = g_list_insert_sorted(protocols, protocol,
+	    proto_compare_name);
 
 	/* Here we do allocate a new header_field_info struct */
 	hfinfo = g_mem_chunk_alloc(gmc_hfinfo);
 	hfinfo->name = name;
-	hfinfo->abbrev = abbrev;
+	hfinfo->abbrev = filter_name;
 	hfinfo->type = FT_NONE;
 	hfinfo->strings = NULL;
 	hfinfo->bitmask = 0;
 	hfinfo->bitshift = 0;
 	hfinfo->blurb = "";
 	hfinfo->parent = -1; /* this field differentiates protos and fields */
-	hfinfo->display = TRUE; /* XXX protocol is enabled by default */
 
-	return proto_register_field_init(hfinfo, hfinfo->parent);
+	proto_id = proto_register_field_init(hfinfo, hfinfo->parent);
+	protocol->proto_id = proto_id;
+	return proto_id;
 }
 
+/*
+ * Routines to use to iterate over the protocols.
+ * The argument passed to the iterator routines is an opaque cookie to
+ * their callers; it's the GList pointer for the current element in
+ * the list.
+ * The ID of the protocol is returned, or -1 if there is no protocol.
+ */
+int
+proto_get_first_protocol(void **cookie)
+{
+	protocol_t *protocol;
+
+	if (protocols == NULL)
+		return -1;
+	*cookie = protocols;
+	protocol = protocols->data;
+	return protocol->proto_id;
+}
+
+int
+proto_get_next_protocol(void **cookie)
+{
+	GList *list_item = *cookie;
+	protocol_t *protocol;
+
+	list_item = g_list_next(list_item);
+	if (list_item == NULL)
+		return -1;
+	*cookie = list_item;
+	protocol = list_item->data;
+	return protocol->proto_id;
+}
 
 /*
- * XXX - In the future, we might need a hash table or list of procotol
- * characteristics that will be fill in each time proto_register_protocol is 
- * called.
- * A protocol entry could contain the display flag among others (such as the
- * address of the dissector function for intance). The access to an entry
- * by protocol abbrev (which shall be unique) would be faster than the actual
- * way.
+ * Find the protocol list entry for a protocol given its field ID.
  */
+static gint
+compare_proto_id(gconstpointer proto_arg, gconstpointer id_arg)
+{
+	const protocol_t *protocol = proto_arg;
+	const int *id_ptr = id_arg;
 
-gboolean 
-proto_is_protocol_enabled(int n)
+	return (protocol->proto_id == *id_ptr) ? 0 : 1;
+}
+
+static protocol_t *
+find_protocol_by_id(int proto_id)
 {
-	struct header_field_info *hfinfo;
+	GList *list_entry;
+	
+	list_entry = g_list_find_custom(protocols, &proto_id, compare_proto_id);
+	if (list_entry == NULL)
+		return NULL;
+	return list_entry->data;
+}
 
-	hfinfo = proto_registrar_get_nth(n);
-	if (hfinfo)
-		return (hfinfo->display);
-	else
-		return FALSE;
+char *
+proto_get_protocol_name(int proto_id)
+{
+	protocol_t *protocol;
+
+	protocol = find_protocol_by_id(proto_id);
+	return protocol->name;
+}
+
+char *
+proto_get_protocol_short_name(int proto_id)
+{
+	protocol_t *protocol;
 
+	protocol = find_protocol_by_id(proto_id);
+	return protocol->short_name;
+}
+
+char *
+proto_get_protocol_filter_name(int proto_id)
+{
+	protocol_t *protocol;
+
+	protocol = find_protocol_by_id(proto_id);
+	return protocol->filter_name;
+}
+
+gboolean
+proto_is_protocol_enabled(int proto_id)
+{
+	protocol_t *protocol;
+
+	protocol = find_protocol_by_id(proto_id);
+	return protocol->is_enabled;
+}
+
+gboolean
+proto_can_disable_protocol(int proto_id)
+{
+	protocol_t *protocol;
+
+	protocol = find_protocol_by_id(proto_id);
+	return protocol->can_disable;
 }
 
 void 
-proto_set_decoding(int n, gboolean enabled)
+proto_set_decoding(int proto_id, gboolean enabled)
 {
-	struct header_field_info *hfinfo;
+	protocol_t *protocol;
 
-	hfinfo = proto_registrar_get_nth(n);
-	if (hfinfo)
-		hfinfo->display = enabled;
+	protocol = find_protocol_by_id(proto_id);
+	g_assert(enabled || protocol->can_disable);
+	protocol->is_enabled = enabled;
+}
+
+void 
+proto_set_cant_disable(int proto_id)
+{
+	protocol_t *protocol;
+
+	protocol = find_protocol_by_id(proto_id);
+	protocol->can_disable = FALSE;
 }
 
 /* for use with static arrays only, since we don't allocate our own copies
@@ -1528,8 +1652,19 @@ proto_register_field_array(int parent, hf_register_info *hf, int num_records)
 {
 	int			field_id, i;
 	hf_register_info	*ptr = hf;
+	protocol_t		*proto;
 
+	proto = find_protocol_by_id(parent);
 	for (i = 0; i < num_records; i++, ptr++) {
+		if (proto != NULL) {
+			if (proto->fields == NULL) {
+				proto->fields = g_list_append(NULL, ptr);
+				proto->last_field = proto->fields;
+			} else {
+				proto->last_field =
+				    g_list_append(proto->last_field, ptr)->next;
+			}
+		}
 		field_id = proto_register_field_init(&ptr->hfinfo, parent);
 		*ptr->p_id = field_id;
 	}
diff --git a/epan/proto.h b/epan/proto.h
index b68f789dd8..a919f29380 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1,7 +1,7 @@
 /* proto.h
  * Definitions for protocol display
  *
- * $Id: proto.h,v 1.2 2000/11/16 07:35:42 guy Exp $
+ * $Id: proto.h,v 1.3 2001/01/03 06:55:59 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -109,7 +109,6 @@ enum {
 	BASE_BIN
 };
 
-
 /* information describing a header field */
 typedef struct header_field_info {
 	char				*name;
@@ -193,7 +192,7 @@ proto_register_field(char *name, char *abbrev, enum ftenum type, int parent,
 	struct value_string* vals);
 
 int
-proto_register_protocol(char *name, char *abbrev);
+proto_register_protocol(char *name, char *short_name, char *filter_name);
 
 void
 proto_register_field_array(int parent, hf_register_info *hf, int num_records);
@@ -501,10 +500,30 @@ int proto_registrar_get_parent(int n);
 gboolean proto_registrar_is_protocol(int n);
 
 /* Is item #n decoding enabled ? */
-gboolean proto_is_protocol_enabled(int n);
+gboolean proto_is_protocol_enabled(int proto_id);
+
+/* Can item #n decoding be disabled? */
+gboolean proto_can_disable_protocol(int proto_id);
+
+/* Routines to use to iterate over the protocols; they return the item
+ * number of the protocol in question, and keep state in "*cookie". */
+int proto_get_first_protocol(void **cookie);
+int proto_get_next_protocol(void **cookie);
+
+/* Given a protocol's item number, return its name. */
+char *proto_get_protocol_name(int n);
+
+/* Given a protocol's item number, return its short name. */
+char *proto_get_protocol_short_name(int proto_id);
+
+/* Given a protocol's item number, return its filter name. */
+char *proto_get_protocol_filter_name(int proto_id);
 
 /* Enable / Disable protocol */
-void proto_set_decoding(int n, gboolean enabled);
+void proto_set_decoding(int proto_id, gboolean enabled);
+
+/* Disable disabling of protocol */
+void proto_set_cant_disable(int proto_id);
 
 /* Get length of registered field according to field type.
  * 0 means undeterminable at registration time.
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index b5dee383c3..6c12e18fbc 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.3 2001/01/02 19:54:50 guy Exp $
+ * $Id: dfilter_expr_dlg.c,v 1.4 2001/01/03 06:56:00 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -987,7 +987,9 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 	GtkWidget *list_bb, *accept_bt, *close_bt;
 	GtkCTreeNode *protocol_node, *item_node;
 	header_field_info       *hfinfo;
-	int     i, len;
+	int i, len;
+	void *cookie;
+	gchar *name;
 	GHashTable *proto_array;
 
 	window = dlg_window_new("Ethereal: Filter Expression");
@@ -1132,25 +1134,21 @@ dfilter_expr_dlg_new(GtkWidget *filter_te)
 
 	/* a hash table seems excessive, but I don't see support for a
 	   sparse array in glib */
-	proto_array = g_hash_table_new( g_direct_hash, g_direct_equal);
-	len = proto_registrar_n();
-	for (i = 0; i < len; i++) {
- 		if (proto_registrar_is_protocol(i)) {
-			hfinfo = proto_registrar_get_nth(i);
-			if (hfinfo->type == FT_TEXT_ONLY)
-				continue;	/* "text" isn't a filterable field */
-			/* Create a node for the protocol,
-			   and remember it for later use. */
-			protocol_node = gtk_ctree_insert_node(GTK_CTREE(tree),
-			    NULL, NULL,
-			    &hfinfo->name, 5,
-			    NULL, NULL, NULL, NULL,
-			    FALSE, FALSE);
-			gtk_ctree_node_set_row_data(GTK_CTREE(tree),
-			    protocol_node, hfinfo);
-			g_hash_table_insert(proto_array, (gpointer)i,
-			    protocol_node);
-		}
+	proto_array = g_hash_table_new(g_direct_hash, g_direct_equal);
+	for (i = proto_get_first_protocol(&cookie); i != -1;
+	    i = proto_get_next_protocol(&cookie)) {
+		hfinfo = proto_registrar_get_nth(i);
+		/* Create a node for the protocol, and remember it for
+		   later use. */
+		name = proto_get_protocol_short_name(i);
+		protocol_node = gtk_ctree_insert_node(GTK_CTREE(tree),
+		    NULL, NULL,
+		    &name, 5,
+		    NULL, NULL, NULL, NULL,
+		    FALSE, FALSE);
+		gtk_ctree_node_set_row_data(GTK_CTREE(tree), protocol_node,
+		    hfinfo);
+		g_hash_table_insert(proto_array, (gpointer)i, protocol_node);
 	}
 
 	len = proto_registrar_n();
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index f03ebb0b8b..ecda0f6d65 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -1,6 +1,6 @@
 /* proto_dlg.c
  *
- * $Id: proto_dlg.c,v 1.5 2000/08/23 06:56:29 guy Exp $
+ * $Id: proto_dlg.c,v 1.6 2001/01/03 06:56:00 guy Exp $
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
@@ -24,17 +24,6 @@
  *
  */
 
-/*
- * TODO : 
- *
- * Modify proto.c to have a better protocol characteristics database
- * such as ordered list or hash table. This would allow a quick search
- * knowing the protocol abbreviation and to enhance this stuff by adding
- * other fields (hfinfo is currently limited since protocols and fields 
- * share the same structure type).
- *        
- */
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -70,6 +59,7 @@ static GtkWidget *proto_w = NULL;
 static GSList *protocol_list = NULL;
 
 typedef struct protocol_data {
+  char  *name;
   char 	*abbrev;
   int  	hfinfo_index;
 } protocol_data_t;
@@ -211,19 +201,17 @@ static gboolean set_proto_selection(GtkWidget *parent_w)
 
   for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) {
     GtkWidget *button;
-    header_field_info *hfinfo;
     protocol_data_t *p = entry->data;
-    hfinfo = proto_registrar_get_nth(p->hfinfo_index);
+
     button = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(parent_w),
-					       hfinfo->abbrev);      
-    /* XXX optimization but should not use display field */
-    if (hfinfo->display != GTK_TOGGLE_BUTTON (button)->active) {
+					       p->abbrev);
+    if (proto_is_protocol_enabled(p->hfinfo_index) != GTK_TOGGLE_BUTTON (button)->active) {
       proto_set_decoding(p->hfinfo_index, GTK_TOGGLE_BUTTON (button)->active);
       need_redissect = TRUE;
     }  
   }
 
-return need_redissect;
+  return need_redissect;
 
 } /* set_proto_selection */
 
@@ -242,30 +230,22 @@ static void show_proto_selection(GtkWidget *main, GtkWidget *container)
   GtkTooltips *tooltips;
   GtkWidget *table;
   int i, t = 0, l = 0, nb_line, nb_proto = 0;
-
-  /* Obtain the number of "true" protocols */
-
-  for (i = 0; i < proto_registrar_n() ; i++) {
-
-    if (proto_registrar_is_protocol(i)) {
-
-      protocol_data_t *p;
-      header_field_info *hfinfo;
-      hfinfo = proto_registrar_get_nth(i);	  
-
-      if (strcmp(hfinfo->abbrev, "data") == 0 ||
-	  strcmp(hfinfo->abbrev, "text") == 0 ||
-	  strcmp(hfinfo->abbrev, "malformed") == 0 ||
-	  strcmp(hfinfo->abbrev, "short") == 0 ||
-	  strcmp(hfinfo->abbrev, "frame") == 0) continue;
-
-      p = g_malloc(sizeof(protocol_data_t));
-      p->abbrev = hfinfo->abbrev;
-      p->hfinfo_index = i;
-      protocol_list = g_slist_insert_sorted(protocol_list, 
+  void *cookie;
+  protocol_data_t *p;
+
+  /* Iterate over all the protocols */
+
+  for (i = proto_get_first_protocol(&cookie); i != -1;
+       i = proto_get_next_protocol(&cookie)) {
+      if (proto_can_disable_protocol(i)) {
+        p = g_malloc(sizeof(protocol_data_t));
+        p->name = proto_get_protocol_name(i);
+        p->abbrev = proto_get_protocol_filter_name(i);
+        p->hfinfo_index = i;
+        protocol_list = g_slist_insert_sorted(protocol_list, 
 					    p, protocol_data_compare);     
-      nb_proto ++;
-    }
+        nb_proto ++;
+      }
   }
 
   /* create a table (n x NB_COL) of buttons */
@@ -283,15 +263,15 @@ static void show_proto_selection(GtkWidget *main, GtkWidget *container)
 
   for (entry = protocol_list; entry != NULL; entry = g_slist_next(entry)) {
     GtkWidget *button;
-    header_field_info *hfinfo;
-    protocol_data_t *p = entry->data;
-    hfinfo = proto_registrar_get_nth(p->hfinfo_index);	  
+
+    p = entry->data;
     /* button label is the protocol abbrev */
-    button = gtk_toggle_button_new_with_label(hfinfo->abbrev);
+    button = gtk_toggle_button_new_with_label(p->abbrev);
     /* tip is the complete protocol name */
-    gtk_tooltips_set_tip(tooltips, button, hfinfo->name, NULL);
-    gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button), hfinfo->display);
-    gtk_object_set_data(GTK_OBJECT(main), hfinfo->abbrev, button);
+    gtk_tooltips_set_tip(tooltips, button, p->name, NULL);
+    gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(button),
+				proto_is_protocol_enabled(p->hfinfo_index));
+    gtk_object_set_data(GTK_OBJECT(main), p->abbrev, button);
     gtk_table_attach_defaults (GTK_TABLE (table), button, l, l+1, t, t+1);
     gtk_widget_show (button);
     if (++nb_proto % NB_COL) {
diff --git a/packet-aarp.c b/packet-aarp.c
index 40e019b06b..7fc807c345 100644
--- a/packet-aarp.c
+++ b/packet-aarp.c
@@ -1,7 +1,7 @@
 /* packet-aarp.c
  * Routines for Appletalk ARP packet disassembly
  *
- * $Id: packet-aarp.c,v 1.25 2000/11/19 08:53:54 guy Exp $
+ * $Id: packet-aarp.c,v 1.26 2001/01/03 06:55:26 guy Exp $
  *
  * Simon Wilkinson <sxw@dcs.ed.ac.uk>
  *
@@ -127,7 +127,7 @@ aarpproaddr_to_str(guint8 *ad, int ad_len, guint16 type) {
 #define	AR_OP		6
 #define MIN_AARP_HEADER_SIZE	8
 
-void
+static void
 dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   guint16     ar_hrd;
   guint16     ar_pro;
@@ -281,6 +281,7 @@ proto_register_aarp(void)
   };
 
   proto_aarp = proto_register_protocol("Appletalk Address Resolution Protocol",
+				       "AARP",
 				       "aarp");
   proto_register_field_array(proto_aarp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-afs.c b/packet-afs.c
index a0d1f7c393..b371c380b1 100644
--- a/packet-afs.c
+++ b/packet-afs.c
@@ -8,7 +8,7 @@
  * Portions based on information/specs retrieved from the OpenAFS sources at
  *   www.openafs.org, Copyright IBM. 
  *
- * $Id: packet-afs.c,v 1.25 2000/11/30 14:09:14 girlich Exp $
+ * $Id: packet-afs.c,v 1.26 2001/01/03 06:55:26 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1813,7 +1813,8 @@ proto_register_afs(void)
 		&ett_afs_vicestat,
 	};
 
-	proto_afs = proto_register_protocol("Andrew File System (AFS)", "afs");
+	proto_afs = proto_register_protocol("Andrew File System (AFS)",
+	    "AFS (RX)", "afs");
 	proto_register_field_array(proto_afs, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 	register_init_routine(&afs_init_protocol);
diff --git a/packet-aim.c b/packet-aim.c
index a02eb51732..f4499d8e41 100644
--- a/packet-aim.c
+++ b/packet-aim.c
@@ -2,7 +2,7 @@
  * Routines for AIM Instant Messenger (OSCAR) dissection
  * Copyright 2000, Ralf Hoelzer <ralf@well.com>
  *
- * $Id: packet-aim.c,v 1.4 2000/11/28 06:38:47 guy Exp $
+ * $Id: packet-aim.c,v 1.5 2001/01/03 06:55:26 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -610,7 +610,7 @@ proto_register_aim(void)
   };
 
 /* Register the protocol name and description */
-  proto_aim = proto_register_protocol("AOL Instant Messenger", "aim");
+  proto_aim = proto_register_protocol("AOL Instant Messenger", "AIM", "aim");
 
 /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_aim, hf, array_length(hf));
diff --git a/packet-arp.c b/packet-arp.c
index a25ab8a77a..cfc0b67474 100644
--- a/packet-arp.c
+++ b/packet-arp.c
@@ -1,7 +1,7 @@
 /* packet-arp.c
  * Routines for ARP packet disassembly
  *
- * $Id: packet-arp.c,v 1.39 2000/12/29 04:16:57 guy Exp $
+ * $Id: packet-arp.c,v 1.40 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -412,6 +412,7 @@ dissect_atmarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   CHECK_DISPLAY_AS_DATA(proto_arp, tvb, pinfo, tree);
 
+  /* Override the setting to "ARP/RARP". */
   pinfo->current_proto = "ATMARP";
 
   ar_hrd = tvb_get_ntohs(tvb, ATM_AR_HRD);
@@ -927,7 +928,8 @@ proto_register_arp(void)
     &ett_atmarp_tl,
   };
 
-  proto_arp = proto_register_protocol("Address Resolution Protocol", "arp");
+  proto_arp = proto_register_protocol("Address Resolution Protocol",
+				      "ARP/RARP", "arp");
   proto_register_field_array(proto_arp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ascend.c b/packet-ascend.c
index 8a5a7e0d8b..c53239de21 100644
--- a/packet-ascend.c
+++ b/packet-ascend.c
@@ -1,7 +1,7 @@
 /* packet-ascend.c
  * Routines for decoding Lucent/Ascend packet traces
  *
- * $Id: packet-ascend.c,v 1.21 2000/11/29 05:16:14 gram Exp $
+ * $Id: packet-ascend.c,v 1.22 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -143,7 +143,8 @@ proto_register_ascend(void)
     &ett_raw,
   };
 
-  proto_ascend = proto_register_protocol("Lucent/Ascend debug output", "ascend");
+  proto_ascend = proto_register_protocol("Lucent/Ascend debug output",
+					 "Lucent/Ascend", "ascend");
   proto_register_field_array(proto_ascend, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-atalk.c b/packet-atalk.c
index 8ad30255db..4c090d9608 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -1,7 +1,7 @@
 /* packet-atalk.c
  * Routines for Appletalk packet disassembly (DDP, currently).
  *
- * $Id: packet-atalk.c,v 1.47 2000/11/19 08:53:54 guy Exp $
+ * $Id: packet-atalk.c,v 1.48 2001/01/03 06:55:27 guy Exp $
  *
  * Simon Wilkinson <sxw@dcs.ed.ac.uk>
  *
@@ -554,7 +554,7 @@ proto_register_atalk(void)
 
 
   static gint *ett[] = {
-    &ett_ddp,
+	&ett_ddp,
 	&ett_nbp,
 	&ett_nbp_info,
 	&ett_nbp_node,
@@ -563,14 +563,14 @@ proto_register_atalk(void)
 	&ett_rtmp_tuple
   };
 
-  proto_ddp = proto_register_protocol("Datagram Delivery Protocol", "ddp");
+  proto_ddp = proto_register_protocol("Datagram Delivery Protocol", "DDP", "ddp");
   proto_register_field_array(proto_ddp, hf_ddp, array_length(hf_ddp));
 
-  proto_nbp = proto_register_protocol("Name Binding Protocol", "nbp");
+  proto_nbp = proto_register_protocol("Name Binding Protocol", "NBP", "nbp");
   proto_register_field_array(proto_nbp, hf_nbp, array_length(hf_nbp));
 
   proto_rtmp = proto_register_protocol("Routing Table Maintenance Protocol",
-				       "rtmp");
+				       "RTMP", "rtmp");
   proto_register_field_array(proto_rtmp, hf_rtmp, array_length(hf_rtmp));
 
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-atm.c b/packet-atm.c
index 8ce586b955..f3630e8100 100644
--- a/packet-atm.c
+++ b/packet-atm.c
@@ -1,7 +1,7 @@
 /* packet-atm.c
  * Routines for ATM packet disassembly
  *
- * $Id: packet-atm.c,v 1.28 2000/11/29 05:16:15 gram Exp $
+ * $Id: packet-atm.c,v 1.29 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -783,10 +783,11 @@ proto_register_atm(void)
 		&ett_atm_lane_lc_flags,
 		&ett_atm_lane_lc_tlv,
 	};
-	proto_atm = proto_register_protocol("ATM", "atm");
+	proto_atm = proto_register_protocol("ATM", "ATM", "atm");
 	proto_register_field_array(proto_atm, hf, array_length(hf));
-	proto_ilmi = proto_register_protocol("ILMI", "ilmi");
-	proto_atm_lane = proto_register_protocol("ATM LANE", "lane");
+	proto_ilmi = proto_register_protocol("ILMI", "ILMI", "ilmi");
+	proto_atm_lane = proto_register_protocol("ATM LAN Emulation",
+	    "ATM LANE", "lane");
 	proto_register_subtree_array(ett, array_length(ett));
 }
 
diff --git a/packet-auto_rp.c b/packet-auto_rp.c
index b897eceaa5..80ccb3ecfa 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.10 2000/11/19 20:01:22 guy Exp $
+ * $Id: packet-auto_rp.c,v 1.11 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -234,7 +234,8 @@ void proto_register_auto_rp(void)
                 &ett_auto_rp_group
         };
 
-        proto_auto_rp = proto_register_protocol("Cisco Auto-RP", "auto_rp");
+        proto_auto_rp = proto_register_protocol("Cisco Auto-RP",
+	    "Auto-RP", "auto_rp");
         proto_register_field_array(proto_auto_rp, hf, array_length(hf));
         proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-bgp.c b/packet-bgp.c
index f9591fdc6a..06a0463e48 100644
--- a/packet-bgp.c
+++ b/packet-bgp.c
@@ -2,7 +2,7 @@
  * Routines for BGP packet dissection.
  * Copyright 1999, Jun-ichiro itojun Hagino <itojun@itojun.org>
  *
- * $Id: packet-bgp.c,v 1.30 2000/12/28 05:13:14 itojun Exp $
+ * $Id: packet-bgp.c,v 1.31 2001/01/03 06:55:27 guy Exp $
  * 
  * Supports:
  * RFC1771 A Border Gateway Protocol 4 (BGP-4)
@@ -1507,7 +1507,8 @@ proto_register_bgp(void)
       &ett_bgp_option,
     };
 
-    proto_bgp = proto_register_protocol("Border Gateway Protocol", "bgp");
+    proto_bgp = proto_register_protocol("Border Gateway Protocol",
+					"BGP", "bgp");
     proto_register_field_array(proto_bgp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-bootp.c b/packet-bootp.c
index 2f70c589e9..fccced1d90 100644
--- a/packet-bootp.c
+++ b/packet-bootp.c
@@ -2,7 +2,7 @@
  * Routines for BOOTP/DHCP packet disassembly
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-bootp.c,v 1.42 2000/11/19 08:53:55 guy Exp $
+ * $Id: packet-bootp.c,v 1.43 2001/01/03 06:55:27 guy Exp $
  *
  * The information used comes from:
  * RFC  951: Bootstrap Protocol
@@ -829,7 +829,8 @@ proto_register_bootp(void)
     &ett_bootp_option,
   };
   
-  proto_bootp = proto_register_protocol("Bootstrap Protocol", "bootp");
+  proto_bootp = proto_register_protocol("Bootstrap Protocol", "BOOTP/DHCP",
+					"bootp");
   proto_register_field_array(proto_bootp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-bootparams.c b/packet-bootparams.c
index e912feec56..d6d9b20c83 100644
--- a/packet-bootparams.c
+++ b/packet-bootparams.c
@@ -1,7 +1,7 @@
 /* packet-bootparams.c
  * Routines for bootparams dissection
  *
- * $Id: packet-bootparams.c,v 1.13 2000/08/14 11:36:03 girlich Exp $
+ * $Id: packet-bootparams.c,v 1.14 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -179,7 +179,8 @@ proto_register_bootparams(void)
 		&ett_bootparams,
 	};
 
-	proto_bootparams = proto_register_protocol("Boot Parameters", "bootparams");
+	proto_bootparams = proto_register_protocol("Boot Parameters",
+	    "BOOTPARAMS", "bootparams");
 	proto_register_field_array(proto_bootparams, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-bpdu.c b/packet-bpdu.c
index 083f993518..31aa099c8b 100644
--- a/packet-bpdu.c
+++ b/packet-bpdu.c
@@ -1,7 +1,7 @@
 /* packet-bpdu.c
  * Routines for BPDU (Spanning Tree Protocol) disassembly
  *
- * $Id: packet-bpdu.c,v 1.17 2000/12/23 08:06:14 guy Exp $
+ * $Id: packet-bpdu.c,v 1.18 2001/01/03 06:55:27 guy Exp $
  *
  * Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
  * 
@@ -315,7 +315,7 @@ proto_register_bpdu(void)
     &ett_bpdu,
   };
 
-  proto_bpdu = proto_register_protocol("Spanning Tree Protocol", "stp");
+  proto_bpdu = proto_register_protocol("Spanning Tree Protocol", "STP", "stp");
   proto_register_field_array(proto_bpdu, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-bxxp.c b/packet-bxxp.c
index 953fb3404b..73cd680d8b 100644
--- a/packet-bxxp.c
+++ b/packet-bxxp.c
@@ -1,7 +1,7 @@
 /* packet-bxxp.c
  * Routines for BXXP packet disassembly
  *
- * $Id: packet-bxxp.c,v 1.12 2000/12/02 08:41:07 guy Exp $
+ * $Id: packet-bxxp.c,v 1.13 2001/01/03 06:55:27 guy Exp $
  *
  * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
  *
@@ -1213,6 +1213,13 @@ proto_register_bxxp(void)
   };
   module_t *bxxp_module; 
 
+  proto_bxxp = proto_register_protocol("Blocks eXtensible eXchange Protocol",
+				       "BXXP", "bxxp");
+
+  proto_register_field_array(proto_bxxp, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
+  register_init_routine(&bxxp_init_protocol);
+
   /* Register our configuration options for BXXP, particularly our port */
 
   bxxp_module = prefs_register_module("bxxp", "BXXP", proto_reg_handoff_bxxp);
@@ -1227,14 +1234,6 @@ proto_register_bxxp(void)
 				 "Specifies that BXXP requires CRLF as a "
 				 "terminator, and not just CR or LF",
 				 &global_bxxp_strict_term);
-
-  proto_bxxp = proto_register_protocol("Blocks eXtensible eXchange Protocol",
-				       "bxxp");
-
-  proto_register_field_array(proto_bxxp, hf, array_length(hf));
-  proto_register_subtree_array(ett, array_length(ett));
-  register_init_routine(&bxxp_init_protocol);
-
 }
 
 /* The registration hand-off routine */
diff --git a/packet-cdp.c b/packet-cdp.c
index 2b55293d57..4a6475014c 100644
--- a/packet-cdp.c
+++ b/packet-cdp.c
@@ -2,7 +2,7 @@
  * Routines for the disassembly of the "Cisco Discovery Protocol"
  * (c) Copyright Hannes R. Boehm <hannes@boehm.org>
  *
- * $Id: packet-cdp.c,v 1.28 2000/12/28 09:49:09 guy Exp $
+ * $Id: packet-cdp.c,v 1.29 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -490,7 +490,8 @@ proto_register_cdp(void)
 	&ett_cdp_capabilities,
     };
 
-    proto_cdp = proto_register_protocol("Cisco Discovery Protocol", "cdp");
+    proto_cdp = proto_register_protocol("Cisco Discovery Protocol",
+					"CDP", "cdp");
     proto_register_field_array(proto_cdp, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-cgmp.c b/packet-cgmp.c
index 8485208b17..f0212de700 100644
--- a/packet-cgmp.c
+++ b/packet-cgmp.c
@@ -1,7 +1,7 @@
 /* packet-cgmp.c
  * Routines for the disassembly of the Cisco Group Management Protocol
  *
- * $Id: packet-cgmp.c,v 1.6 2000/12/28 09:49:09 guy Exp $
+ * $Id: packet-cgmp.c,v 1.7 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -135,7 +135,8 @@ proto_register_cgmp(void)
 		&ett_cgmp,
 	};
 
-        proto_cgmp = proto_register_protocol("Cisco Group Management Protocol", "cgmp");
+        proto_cgmp = proto_register_protocol("Cisco Group Management Protocol",
+	    "CGMP", "cgmp");
         proto_register_field_array(proto_cgmp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-clnp.c b/packet-clnp.c
index 82bfa8910f..b950521922 100644
--- a/packet-clnp.c
+++ b/packet-clnp.c
@@ -1,7 +1,7 @@
 /* packet-clnp.c
  * Routines for ISO/OSI network and transport protocol packet disassembly
  *
- * $Id: packet-clnp.c,v 1.19 2000/12/23 23:06:50 guy Exp $
+ * $Id: packet-clnp.c,v 1.20 2001/01/03 06:55:27 guy Exp $
  * Laurent Deniel <deniel@worldnet.fr>
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
@@ -1873,7 +1873,7 @@ void proto_register_clnp(void)
 
   module_t *clnp_module;
 
-  proto_clnp = proto_register_protocol(PROTO_STRING_CLNP, "clnp");
+  proto_clnp = proto_register_protocol(PROTO_STRING_CLNP, "CLNP", "clnp");
   proto_register_field_array(proto_clnp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
@@ -1899,7 +1899,7 @@ void proto_register_cotp(void)
 		&ett_cotp,
 	};
 
-        proto_cotp = proto_register_protocol(PROTO_STRING_COTP, "cotp");
+        proto_cotp = proto_register_protocol(PROTO_STRING_COTP, "COTP", "cotp");
  /*       proto_register_field_array(proto_cotp, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 
@@ -1919,7 +1919,7 @@ void proto_register_cltp(void)
 		&ett_cltp,
 	};
 
-        proto_cltp = proto_register_protocol(PROTO_STRING_CLTP, "cltp");
+        proto_cltp = proto_register_protocol(PROTO_STRING_CLTP, "CLTP", "cltp");
  /*       proto_register_field_array(proto_cotp, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-cops.c b/packet-cops.c
index 021c03c3a2..154b73532b 100644
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -4,7 +4,7 @@
  *
  * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-cops.c,v 1.7 2000/12/27 12:38:08 guy Exp $
+ * $Id: packet-cops.c,v 1.8 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -815,7 +815,8 @@ void proto_register_cops(void)
         };
 
         /* Register the protocol name and description */
-        proto_cops = proto_register_protocol("Common Open Policy Service", "cops");
+        proto_cops = proto_register_protocol("Common Open Policy Service",
+	    "COPS", "cops");
 
         /* Required function calls to register the header fields and subtrees used */
         proto_register_field_array(proto_cops, hf, array_length(hf));
diff --git a/packet-data.c b/packet-data.c
index 82b0e0801e..46da3a1c6b 100644
--- a/packet-data.c
+++ b/packet-data.c
@@ -2,7 +2,7 @@
  * Routines for raw data (default case)
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-data.c,v 1.20 2000/11/16 07:35:37 guy Exp $
+ * $Id: packet-data.c,v 1.21 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -71,6 +71,15 @@ void
 proto_register_data(void)
 {
 	proto_data = proto_register_protocol (
-		/* name */	"Data",
-		/* abbrev */	"data" );
+		"Data",		/* name */
+		"Data",		/* short name */
+		"data"		/* abbrev */
+		);
+
+	/*
+	 * "Data" is used to dissect something whose normal dissector
+	 * is disabled, so it cannot itself be disabled.
+	 */
+	proto_set_cant_disable(proto_data);
+
 }
diff --git a/packet-ddtp.c b/packet-ddtp.c
index 3ec6eaa0f4..cd4a5325c9 100644
--- a/packet-ddtp.c
+++ b/packet-ddtp.c
@@ -3,7 +3,7 @@
  * see http://ddt.sourceforge.net/
  * Olivier Abad <oabad@cybercable.fr>
  *
- * $Id: packet-ddtp.c,v 1.11 2000/11/19 08:53:56 guy Exp $
+ * $Id: packet-ddtp.c,v 1.12 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -190,7 +190,8 @@ proto_register_ddtp(void)
 
     static gint *ett[] = { &ett_ddtp };
 
-    proto_ddtp = proto_register_protocol("Dynamic DNS Tools Protocol", "ddtp");
+    proto_ddtp = proto_register_protocol("Dynamic DNS Tools Protocol",
+					 "DDTP", "ddtp");
     proto_register_field_array(proto_ddtp, hf_ddtp, array_length(hf_ddtp));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-diameter.c b/packet-diameter.c
index 352312e8d0..82eb602368 100644
--- a/packet-diameter.c
+++ b/packet-diameter.c
@@ -1,7 +1,7 @@
 /* packet-diameter.c
  * Routines for DIAMETER packet disassembly
  *
- * $Id: packet-diameter.c,v 1.8 2000/11/19 08:53:56 guy Exp $
+ * $Id: packet-diameter.c,v 1.9 2001/01/03 06:55:27 guy Exp $
  *
  * Copyright (c) 2000 by David Frascone <chaos@mindspring.com>
  *
@@ -697,9 +697,14 @@ proto_register_diameter(void)
 		&ett_diameter_avpinfo
 	};
 	module_t *diameter_module;
-	
+
+	proto_diameter = proto_register_protocol (gbl_diameterString,
+	    "DIAMETER", "diameter");
+	proto_register_field_array(proto_diameter, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+
 	/* Register a configuration option for port */
-	diameter_module = prefs_register_module("Diameter", "Diameter",
+	diameter_module = prefs_register_module("Diameter", "diameter",
 	    proto_reg_handoff_diameter);
 	prefs_register_uint_preference(diameter_module, "udp.port",
 				       "DIAMETER UDP Port",
@@ -723,10 +728,6 @@ proto_register_diameter(void)
 				       "Command code in header",
 				       "Whether the command code is in the header, or in the first AVP",
 				       &gbl_commandCodeInHeader);
-
-	proto_diameter = proto_register_protocol (gbl_diameterString, "diameter");
-	proto_register_field_array(proto_diameter, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
 }
 
 void
diff --git a/packet-dns.c b/packet-dns.c
index 1212f404ad..4773884f2a 100644
--- a/packet-dns.c
+++ b/packet-dns.c
@@ -1,7 +1,7 @@
 /* packet-dns.c
  * Routines for DNS packet disassembly
  *
- * $Id: packet-dns.c,v 1.59 2000/11/19 08:53:56 guy Exp $
+ * $Id: packet-dns.c,v 1.60 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -2474,7 +2474,7 @@ proto_register_dns(void)
     &ett_t_key_flags,
   };
 
-  proto_dns = proto_register_protocol("Domain Name Service", "dns");
+  proto_dns = proto_register_protocol("Domain Name Service", "DNS", "dns");
   proto_register_field_array(proto_dns, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-eigrp.c b/packet-eigrp.c
index 194aeb08b2..be25b95244 100644
--- a/packet-eigrp.c
+++ b/packet-eigrp.c
@@ -2,7 +2,7 @@
  * Routines for EIGRP dissection
  * Copyright 2000, Paul Ionescu <paul@acorp.ro>
  *
- * $Id: packet-eigrp.c,v 1.9 2000/11/19 08:53:56 guy Exp $
+ * $Id: packet-eigrp.c,v 1.10 2001/01/03 06:55:27 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -457,7 +457,8 @@ proto_register_eigrp(void)
         &ett_eigrp,
 	&ett_tlv,
       };
-   proto_eigrp = proto_register_protocol("Enhanced Interior Gateway Routing Protocol", "eigrp");
+   proto_eigrp = proto_register_protocol("Enhanced Interior Gateway Routing Protocol",
+					 "EIGRP", "eigrp");
    proto_register_field_array(proto_eigrp, hf, array_length(hf));
    proto_register_subtree_array(ett, array_length(ett));
    }
diff --git a/packet-esis.c b/packet-esis.c
index ec10dfe667..a661df9039 100644
--- a/packet-esis.c
+++ b/packet-esis.c
@@ -2,7 +2,7 @@
  * Routines for ISO/OSI End System to Intermediate System  
  * Routeing Exchange Protocol ISO 9542.
  *
- * $Id: packet-esis.c,v 1.9 2000/11/19 08:53:56 guy Exp $
+ * $Id: packet-esis.c,v 1.10 2001/01/03 06:55:28 guy Exp $
  * Ralf Schneider <Ralf.Schneider@t-online.de>
  *
  * Ethereal - Network traffic analyzer
@@ -424,7 +424,7 @@ proto_register_esis(void) {
     &ett_esis_area_addr,
   };
 
-  proto_esis = proto_register_protocol( PROTO_STRING_ESIS, "esis");
+  proto_esis = proto_register_protocol( PROTO_STRING_ESIS, "ESIS", "esis");
   proto_register_field_array(proto_esis, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 };
diff --git a/packet-eth.c b/packet-eth.c
index a8adf5706d..109910086e 100644
--- a/packet-eth.c
+++ b/packet-eth.c
@@ -1,7 +1,7 @@
 /* packet-eth.c
  * Routines for ethernet packet disassembly
  *
- * $Id: packet-eth.c,v 1.51 2000/12/28 09:49:09 guy Exp $
+ * $Id: packet-eth.c,v 1.52 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -375,7 +375,7 @@ proto_register_eth(void)
 		&ett_ether2,
 	};
 
-	proto_eth = proto_register_protocol ("Ethernet", "eth" );
+	proto_eth = proto_register_protocol("Ethernet", "Ethernet", "eth");
 	proto_register_field_array(proto_eth, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-fddi.c b/packet-fddi.c
index 72351bc4b4..85dc71ab24 100644
--- a/packet-fddi.c
+++ b/packet-fddi.c
@@ -3,7 +3,7 @@
  *
  * Laurent Deniel <deniel@worldnet.fr>
  *
- * $Id: packet-fddi.c,v 1.43 2000/11/29 05:16:15 gram Exp $
+ * $Id: packet-fddi.c,v 1.44 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -369,7 +369,8 @@ proto_register_fddi(void)
 		&ett_fddi,
 	};
 
-	proto_fddi = proto_register_protocol ("Fiber Distributed Data Interface", "fddi" );
+	proto_fddi = proto_register_protocol("Fiber Distributed Data Interface",
+	    "FDDI", "fddi");
 	proto_register_field_array(proto_fddi, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-frame.c b/packet-frame.c
index 8e225bf62a..bd04a7de29 100644
--- a/packet-frame.c
+++ b/packet-frame.c
@@ -2,7 +2,7 @@
  *
  * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
  *
- * $Id: packet-frame.c,v 1.5 2000/12/29 04:16:57 guy Exp $
+ * $Id: packet-frame.c,v 1.6 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -185,11 +185,20 @@ proto_register_frame(void)
 
 	wtap_encap_dissector_table = register_dissector_table("wtap_encap");
 
-	proto_frame = proto_register_protocol("Frame", "frame");
+	proto_frame = proto_register_protocol("Frame", "Frame", "frame");
 	proto_register_field_array(proto_frame, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
-	proto_short = proto_register_protocol("Short Frame", "short");
-	proto_malformed = proto_register_protocol("Malformed Frame", "malformed");
+	/* You can't disable dissection of "Frame", as that would be
+	   tantamount to not doing any dissection whatsoever. */
+	proto_set_cant_disable(proto_frame);
 
+	proto_short = proto_register_protocol("Short Frame", "Short frame", "short");
+	proto_malformed = proto_register_protocol("Malformed Frame",
+	    "Malformed frame", "malformed");
+
+	/* "Short Frame" and "Malformed Frame" aren't really protocols,
+	   they're error indications; disabling them makes no sense. */
+	proto_set_cant_disable(proto_short);
+	proto_set_cant_disable(proto_malformed);
 }
diff --git a/packet-ftp.c b/packet-ftp.c
index 7b545cf91f..534ba1b06f 100644
--- a/packet-ftp.c
+++ b/packet-ftp.c
@@ -2,7 +2,7 @@
  * Routines for ftp packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-ftp.c,v 1.24 2000/12/19 02:57:49 gram Exp $
+ * $Id: packet-ftp.c,v 1.25 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -254,8 +254,9 @@ proto_register_ftp(void)
     &ett_ftp_data,
   };
 
-  proto_ftp = proto_register_protocol("File Transfer Protocol (FTP)", "ftp");
-  proto_ftp_data = proto_register_protocol("FTP Data", "ftp-data");
+  proto_ftp = proto_register_protocol("File Transfer Protocol (FTP)", "FTP",
+				      "ftp");
+  proto_ftp_data = proto_register_protocol("FTP Data", "FTP-DATA", "ftp-data");
   proto_register_field_array(proto_ftp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-giop.c b/packet-giop.c
index 6b6368bb22..297056569d 100644
--- a/packet-giop.c
+++ b/packet-giop.c
@@ -4,7 +4,7 @@
  * Laurent Deniel <deniel@worldnet.fr>
  * Craig Rodrigues <rodrigc@mediaone.net>
  *
- * $Id: packet-giop.c,v 1.26 2000/11/19 08:53:57 guy Exp $
+ * $Id: packet-giop.c,v 1.27 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1426,7 +1426,8 @@ proto_register_giop (void)
     &ett_giop_locate_reply,
     &ett_giop_fragment
   };
-  proto_giop = proto_register_protocol ("General Inter-ORB Protocol", "giop");
+  proto_giop = proto_register_protocol("General Inter-ORB Protocol", "GIOP",
+				       "giop");
   proto_register_field_array (proto_giop, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 }
diff --git a/packet-gre.c b/packet-gre.c
index 5271720cf2..9f710c3434 100644
--- a/packet-gre.c
+++ b/packet-gre.c
@@ -2,7 +2,7 @@
  * Routines for the Generic Routing Encapsulation (GRE) protocol
  * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
  *
- * $Id: packet-gre.c,v 1.32 2000/12/15 00:03:09 guy Exp $
+ * $Id: packet-gre.c,v 1.33 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -357,7 +357,8 @@ proto_register_gre(void)
 		&ett_gre_wccp2_redirect_header,
 	};
 
-        proto_gre = proto_register_protocol("Generic Routing Encapsulation", "gre");
+        proto_gre = proto_register_protocol("Generic Routing Encapsulation",
+	    "GRE", "gre");
         proto_register_field_array(proto_gre, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-gvrp.c b/packet-gvrp.c
index 9c9b5a8ef4..4e4c0b11c6 100644
--- a/packet-gvrp.c
+++ b/packet-gvrp.c
@@ -2,7 +2,7 @@
  * Routines for GVRP (GARP VLAN Registration Protocol) dissection
  * Copyright 2000, Kevin Shi <techishi@ms22.hinet.net>
  *
- * $Id: packet-gvrp.c,v 1.3 2000/12/02 08:56:40 guy Exp $
+ * $Id: packet-gvrp.c,v 1.4 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -337,7 +337,7 @@ proto_register_gvrp(void)
 
     /* Register the protocol name and description for GVRP */
     proto_gvrp = proto_register_protocol("GARP VLAN Registration Protocol",
-					 "gvrp");
+					 "GVRP", "gvrp");
 
     /* Required function calls to register the header fields and subtrees
      * used by GVRP */
diff --git a/packet-h1.c b/packet-h1.c
index b3cfe66612..a3c12dab49 100644
--- a/packet-h1.c
+++ b/packet-h1.c
@@ -2,7 +2,7 @@
  * Routines for Sinec H1 packet disassembly
  * Gerrit Gehnen <G.Gehnen@atrie.de>
  *
- * $Id: packet-h1.c,v 1.14 2000/11/19 08:53:57 guy Exp $
+ * $Id: packet-h1.c,v 1.15 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -306,7 +306,7 @@ proto_register_h1 (void)
     &ett_empty
   };
 
-  proto_h1 = proto_register_protocol ("Sinec H1 Protocol", "h1");
+  proto_h1 = proto_register_protocol ("Sinec H1 Protocol", "H1", "h1");
   proto_register_field_array (proto_h1, hf, array_length (hf));
   proto_register_subtree_array (ett, array_length (ett));
 }
diff --git a/packet-h261.c b/packet-h261.c
index 4d2eba4dbe..480f91ec5d 100644
--- a/packet-h261.c
+++ b/packet-h261.c
@@ -256,7 +256,8 @@ proto_register_h261(void)
 	};
 
 
-	proto_h261 = proto_register_protocol("ITU-T Recommendation H.261", "h261");
+	proto_h261 = proto_register_protocol("ITU-T Recommendation H.261",
+	    "H.261", "h261");
 	proto_register_field_array(proto_h261, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-hsrp.c b/packet-hsrp.c
index 87a4e8db9c..4980566960 100644
--- a/packet-hsrp.c
+++ b/packet-hsrp.c
@@ -4,7 +4,7 @@
  *
  * Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-hsrp.c,v 1.12 2000/12/02 08:41:07 guy Exp $
+ * $Id: packet-hsrp.c,v 1.13 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -231,7 +231,8 @@ void proto_register_hsrp(void)
                 &ett_hsrp,
         };
 
-        proto_hsrp = proto_register_protocol("Cisco Hot Standby Router Protocol", "hsrp");
+        proto_hsrp = proto_register_protocol("Cisco Hot Standby Router Protocol",
+	    "HSRP", "hsrp");
         proto_register_field_array(proto_hsrp, hf, array_length(hf));
         proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-http.c b/packet-http.c
index e4e58e7416..6ebe960f64 100644
--- a/packet-http.c
+++ b/packet-http.c
@@ -3,7 +3,7 @@
  *
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-http.c,v 1.31 2001/01/03 03:40:28 guy Exp $
+ * $Id: packet-http.c,v 1.32 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -387,7 +387,7 @@ proto_register_http(void)
 	};
 
 	proto_http = proto_register_protocol("Hypertext Transfer Protocol",
-	    "http");
+	    "HTTP", "http");
 	proto_register_field_array(proto_http, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-icmpv6.c b/packet-icmpv6.c
index 0f390a2f1d..7b0b6e5810 100644
--- a/packet-icmpv6.c
+++ b/packet-icmpv6.c
@@ -1,7 +1,7 @@
 /* packet-icmpv6.c
  * Routines for ICMPv6 packet disassembly
  *
- * $Id: packet-icmpv6.c,v 1.32 2000/12/14 21:45:12 guy Exp $
+ * $Id: packet-icmpv6.c,v 1.33 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1186,7 +1186,7 @@ proto_register_icmpv6(void)
   };
 
   proto_icmpv6 = proto_register_protocol("Internet Control Message Protocol v6",
-					 "icmpv6");
+					 "ICMPv6", "icmpv6");
   proto_register_field_array(proto_icmpv6, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-icp.c b/packet-icp.c
index d9a4d7b01c..b8490ac7f0 100644
--- a/packet-icp.c
+++ b/packet-icp.c
@@ -2,7 +2,7 @@
  * Routines for ICP (internet cache protocol) packet disassembly
  * RFC 2186 && RFC 2187
  *
- * $Id: packet-icp.c,v 1.13 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-icp.c,v 1.14 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Peter Torvals
@@ -184,7 +184,8 @@ static void dissect_icp(const u_char *pd, int offset, frame_data *fd,
 
   OLD_CHECK_DISPLAY_AS_DATA(proto_icp, pd, offset, fd, tree);
 
-/* TBD: check if this is a fragment or first part of udp packet */
+/* TBD: check if this is the first fragment of a fragmented UDP datagram?
+   Or just wait for IP fragment reassembly to be implemented? */
   icph.opcode=pd[offset];
   icph.version=pd[offset+1];
   icph.message_length=pntohs(&(pd[offset+2]));
@@ -288,7 +289,8 @@ proto_register_icp(void)
 		&ett_icp_payload,
 	};
 
-	proto_icp = proto_register_protocol ("Internet Cache Protocol", "icp");
+	proto_icp = proto_register_protocol("Internet Cache Protocol",
+	    "ICP", "icp");
 	proto_register_field_array(proto_icp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-icq.c b/packet-icq.c
index 90720af220..b274242396 100644
--- a/packet-icq.c
+++ b/packet-icq.c
@@ -1,7 +1,7 @@
 /* packet-icq.c
  * Routines for ICQ packet disassembly
  *
- * $Id: packet-icq.c,v 1.24 2000/11/21 16:17:58 gram Exp $
+ * $Id: packet-icq.c,v 1.25 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Johan Feyaerts
@@ -2487,7 +2487,7 @@ proto_register_icq(void)
         &ett_icq_body_parts,
     };
     
-    proto_icq = proto_register_protocol ("ICQ Protocol", "icq");
+    proto_icq = proto_register_protocol("ICQ Protocol", "ICQ", "icq");
     
     proto_register_field_array(proto_icq, hf, array_length(hf));
 
diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index 91b43088c7..a7cdcc812b 100644
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
  * Copyright 2000, Axis Communications AB 
  * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
  *
- * $Id: packet-ieee80211.c,v 1.6 2000/12/02 09:09:25 guy Exp $
+ * $Id: packet-ieee80211.c,v 1.7 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -1735,7 +1735,8 @@ proto_register_wlan (void)
     &ett_cap_tree,
   };
 
-  proto_wlan = proto_register_protocol ("IEEE 802.11 wireless LAN", "wlan");
+  proto_wlan = proto_register_protocol ("IEEE 802.11 wireless LAN",
+					"IEEE 802.11", "wlan");
   proto_register_field_array (proto_wlan, hf, array_length (hf));
   proto_register_subtree_array (tree_array, array_length (tree_array));
 }
diff --git a/packet-igrp.c b/packet-igrp.c
index 347697a098..5a8cf58ed9 100644
--- a/packet-igrp.c
+++ b/packet-igrp.c
@@ -2,7 +2,7 @@
  * Routines for IGRP dissection
  * Copyright 2000, Paul Ionescu <paul@acorp.ro>
  * 
- * $Id: packet-igrp.c,v 1.2 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-igrp.c,v 1.3 2001/01/03 06:55:28 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -196,7 +196,8 @@ void proto_register_igrp(void)
   };
 
   /* Register the protocol name and description */
-  proto_igrp = proto_register_protocol("Cisco Interior Gateway Routing Protocol", "igrp");
+  proto_igrp = proto_register_protocol("Cisco Interior Gateway Routing Protocol",
+				       "IGRP", "igrp");
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_igrp, hf, array_length(hf));
diff --git a/packet-imap.c b/packet-imap.c
index 4daf79cb18..0c18d550c7 100644
--- a/packet-imap.c
+++ b/packet-imap.c
@@ -2,7 +2,7 @@
  * Routines for imap packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-imap.c,v 1.11 2000/12/29 02:19:14 guy Exp $
+ * $Id: packet-imap.c,v 1.12 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -174,7 +174,7 @@ proto_register_imap(void)
   };
 
   proto_imap = proto_register_protocol("Internet Message Access Protocol", 
-				       "imap");
+				       "IMAP", "imap");
   proto_register_field_array(proto_imap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ip.c b/packet-ip.c
index 5ed582f86c..00a792ea8b 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
 /* packet-ip.c
  * Routines for IP and miscellaneous IP protocol packet disassembly
  *
- * $Id: packet-ip.c,v 1.115 2000/12/29 04:16:57 guy Exp $
+ * $Id: packet-ip.c,v 1.116 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1324,7 +1324,8 @@ proto_register_igmp(void)
 		&ett_igmp,
 	};
 
-	proto_igmp = proto_register_protocol ("Internet Group Management Protocol", "igmp");
+	proto_igmp = proto_register_protocol("Internet Group Management Protocol",
+	    "IGMP", "igmp");
 	proto_register_field_array(proto_igmp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
@@ -1456,7 +1457,7 @@ proto_register_ip(void)
 	};
 	module_t *ip_module;
 
-	proto_ip = proto_register_protocol ("Internet Protocol", "ip");
+	proto_ip = proto_register_protocol("Internet Protocol", "IP", "ip");
 	proto_register_field_array(proto_ip, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
@@ -1506,8 +1507,8 @@ proto_register_icmp(void)
     &ett_icmp,
   };
   
-  proto_icmp = proto_register_protocol ("Internet Control Message Protocol", 
-					"icmp");
+  proto_icmp = proto_register_protocol("Internet Control Message Protocol", 
+				       "ICMP", "icmp");
   proto_register_field_array(proto_icmp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ipp.c b/packet-ipp.c
index b6f8ee082f..259914a255 100644
--- a/packet-ipp.c
+++ b/packet-ipp.c
@@ -3,7 +3,7 @@
  *
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-ipp.c,v 1.17 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-ipp.c,v 1.18 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -556,7 +556,8 @@ proto_register_ipp(void)
 		&ett_ipp_attr,
 	};
 
-        proto_ipp = proto_register_protocol("Internet Printing Protocol", "ipp");
+        proto_ipp = proto_register_protocol("Internet Printing Protocol",
+	    "IPP", "ipp");
  /*       proto_register_field_array(proto_ipp, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-ipsec.c b/packet-ipsec.c
index 21406b019c..54b75b7eba 100644
--- a/packet-ipsec.c
+++ b/packet-ipsec.c
@@ -1,7 +1,7 @@
 /* packet-ipsec.c
  * Routines for IPsec/IPComp packet disassembly 
  *
- * $Id: packet-ipsec.c,v 1.22 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-ipsec.c,v 1.23 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -342,13 +342,15 @@ proto_register_ipsec(void)
 
   module_t *ah_module;
 
-  proto_ah = proto_register_protocol("Authentication Header", "ah");
+  proto_ah = proto_register_protocol("Authentication Header", "AH", "ah");
   proto_register_field_array(proto_ah, hf_ah, array_length(hf_ah));
 
-  proto_esp = proto_register_protocol("Encapsulated Security Payload", "esp");
+  proto_esp = proto_register_protocol("Encapsulated Security Payload",
+				      "ESP", "esp");
   proto_register_field_array(proto_esp, hf_esp, array_length(hf_esp));
 
-  proto_ipcomp = proto_register_protocol("IP Payload Compression", "ipcomp");
+  proto_ipcomp = proto_register_protocol("IP Payload Compression",
+					 "IPComp", "ipcomp");
   proto_register_field_array(proto_ipcomp, hf_ipcomp, array_length(hf_ipcomp));
 
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-ipv6.c b/packet-ipv6.c
index d2d55ff6a5..bcf48c5929 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.48 2000/12/14 18:56:22 guy Exp $
+ * $Id: packet-ipv6.c,v 1.49 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -517,7 +517,8 @@ proto_register_ipv6(void)
     &ett_ipv6,
   };
 
-  proto_ipv6 = proto_register_protocol("Internet Protocol Version 6", "ipv6");
+  proto_ipv6 = proto_register_protocol("Internet Protocol Version 6",
+				       "IPv6", "ipv6");
   proto_register_field_array(proto_ipv6, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ipx.c b/packet-ipx.c
index 7eb2f9c6a8..edf691454c 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.71 2000/12/03 09:18:20 guy Exp $
+ * $Id: packet-ipx.c,v 1.72 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -878,19 +878,24 @@ proto_register_ipx(void)
 		&ett_ipxsap_server,
 	};
 
-	proto_ipx = proto_register_protocol ("Internetwork Packet eXchange", "ipx");
+	proto_ipx = proto_register_protocol("Internetwork Packet eXchange",
+	    "IPX", "ipx");
 	proto_register_field_array(proto_ipx, hf_ipx, array_length(hf_ipx));
 
-	proto_spx = proto_register_protocol ("Sequenced Packet eXchange", "spx");
+	proto_spx = proto_register_protocol("Sequenced Packet eXchange",
+	    "SPX", "spx");
 	proto_register_field_array(proto_spx, hf_spx, array_length(hf_spx));
 
-	proto_ipxrip = proto_register_protocol ("IPX Routing Information Protocol", "ipxrip");
+	proto_ipxrip = proto_register_protocol("IPX Routing Information Protocol",
+	    "IPX RIP", "ipxrip");
 	proto_register_field_array(proto_ipxrip, hf_ipxrip, array_length(hf_ipxrip));
 
-	proto_ipxmsg = proto_register_protocol ("IPX Message", "ipxmsg");
+	proto_ipxmsg = proto_register_protocol("IPX Message", "IPX MSG",
+	    "ipxmsg");
 	proto_register_field_array(proto_ipxmsg, hf_ipxmsg, array_length(hf_ipxmsg));
 
-	proto_sap = proto_register_protocol ("Service Advertisement Protocol", "ipxsap");
+	proto_sap = proto_register_protocol("Service Advertisement Protocol",
+	    "IPX SAP", "ipxsap");
 	proto_register_field_array(proto_sap, hf_sap, array_length(hf_sap));
 
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-irc.c b/packet-irc.c
index 7a33f199f5..206bafe56f 100644
--- a/packet-irc.c
+++ b/packet-irc.c
@@ -1,7 +1,7 @@
 /* packet-irc.c
  * Routines for MSX irc packet dissection
  *
- * $Id: packet-irc.c,v 1.9 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-irc.c,v 1.10 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -81,7 +81,7 @@ dissect_irc(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
 	OLD_CHECK_DISPLAY_AS_DATA(proto_irc, pd, offset, fd, tree);
 
 	if (check_col(fd, COL_PROTOCOL))
-	col_set_str(fd, COL_PROTOCOL, "IRC");
+		col_set_str(fd, COL_PROTOCOL, "IRC");
 
 	if (check_col(fd, COL_INFO))
 	{
@@ -159,7 +159,7 @@ proto_register_irc(void)
 	static gint *ett[] = {
 		&ett_irc,
 	};
-	proto_irc = proto_register_protocol("Internet Relay Chat", "irc");
+	proto_irc = proto_register_protocol("Internet Relay Chat", "IRC", "irc");
 	proto_register_field_array(proto_irc, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-isakmp.c b/packet-isakmp.c
index f247b294d9..7abecf39f6 100644
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -3,7 +3,7 @@
  * (ISAKMP) (RFC 2408)
  * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
  *
- * $Id: packet-isakmp.c,v 1.32 2000/12/12 09:57:05 itojun Exp $
+ * $Id: packet-isakmp.c,v 1.33 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1445,7 +1445,8 @@ proto_register_isakmp(void)
 		&ett_isakmp_payload,
 	};
 
-        proto_isakmp = proto_register_protocol("Internet Security Association and Key Management Protocol", "isakmp");
+        proto_isakmp = proto_register_protocol("Internet Security Association and Key Management Protocol",
+					       "ISAKMP", "isakmp");
  /*       proto_register_field_array(proto_isakmp, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-isis-hello.c b/packet-isis-hello.c
index 25ad8d4107..b5e466f80c 100644
--- a/packet-isis-hello.c
+++ b/packet-isis-hello.c
@@ -1,7 +1,7 @@
 /* packet-isis-hello.c
  * Routines for decoding isis hello packets and their CLVs
  *
- * $Id: packet-isis-hello.c,v 1.10 2000/08/13 14:08:19 deniel Exp $
+ * $Id: packet-isis-hello.c,v 1.11 2001/01/03 06:55:29 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -589,7 +589,8 @@ proto_register_isis_hello(void) {
 		&ett_isis_hello_clv_ipv4_int_addr,
 	};
 
-	proto_isis_hello = proto_register_protocol("ISIS HELLO", "isis_hello");
+	proto_isis_hello = proto_register_protocol("ISIS HELLO",
+	    "ISIS HELLO", "isis_hello");
 	proto_register_field_array(proto_isis_hello, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-isis-lsp.c b/packet-isis-lsp.c
index fdefde0402..9ec043b18f 100644
--- a/packet-isis-lsp.c
+++ b/packet-isis-lsp.c
@@ -1,7 +1,7 @@
 /* packet-isis-lsp.c
  * Routines for decoding isis lsp packets and their CLVs
  *
- * $Id: packet-isis-lsp.c,v 1.9 2000/08/13 14:08:22 deniel Exp $
+ * $Id: packet-isis-lsp.c,v 1.10 2001/01/03 06:55:29 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -950,7 +950,8 @@ proto_register_isis_lsp(void) {
 		&ett_isis_lsp_clv_ip_reachability,
 	};
 
-	proto_isis_lsp = proto_register_protocol( PROTO_STRING_LSP, "isis_lsp");
+	proto_isis_lsp = proto_register_protocol(PROTO_STRING_LSP,
+	    "ISIS LSP", "isis_lsp");
 	proto_register_field_array(proto_isis_lsp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-isis-snp.c b/packet-isis-snp.c
index e0001f1eae..8a0904c559 100644
--- a/packet-isis-snp.c
+++ b/packet-isis-snp.c
@@ -1,7 +1,7 @@
 /* packet-isis-snp.c
  * Routines for decoding isis complete & partial SNP and their payload
  *
- * $Id: packet-isis-snp.c,v 1.7 2000/08/13 14:08:22 deniel Exp $
+ * $Id: packet-isis-snp.c,v 1.8 2001/01/03 06:55:29 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -463,7 +463,8 @@ proto_register_isis_csnp(void) {
 		&ett_isis_csnp_clv_unknown,
 	};
 
-	proto_isis_csnp = proto_register_protocol(PROTO_STRING_CSNP, "isis_csnp");
+	proto_isis_csnp = proto_register_protocol(PROTO_STRING_CSNP,
+	    "ISIS CSNP", "isis_csnp");
 	proto_register_field_array(proto_isis_csnp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
@@ -501,7 +502,8 @@ proto_register_isis_psnp(void) {
 		&ett_isis_psnp_clv_unknown,
 	};
 
-	proto_isis_psnp = proto_register_protocol(PROTO_STRING_PSNP, "isis_psnp");
+	proto_isis_psnp = proto_register_protocol(PROTO_STRING_PSNP,
+	    "ISIS PSNP", "isis_psnp");
 	proto_register_field_array(proto_isis_psnp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-isis.c b/packet-isis.c
index 0f815bb2e5..d8079ea5ba 100644
--- a/packet-isis.c
+++ b/packet-isis.c
@@ -2,7 +2,7 @@
  * Routines for ISO/OSI network and transport protocol packet disassembly, core
  * bits.
  *
- * $Id: packet-isis.c,v 1.15 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-isis.c,v 1.16 2001/01/03 06:55:29 guy Exp $
  * Stuart Stanley <stuarts@mxmail.net>
  *
  * Ethereal - Network traffic analyzer
@@ -329,7 +329,7 @@ proto_register_isis(void) {
       &ett_isis,
     };
 
-    proto_isis = proto_register_protocol(PROTO_STRING_ISIS, "isis");
+    proto_isis = proto_register_protocol(PROTO_STRING_ISIS, "ISIS", "isis");
     proto_register_field_array(proto_isis, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-isl.c b/packet-isl.c
index 9c8f485f1f..a611eb314f 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.19 2000/12/29 00:51:52 guy Exp $
+ * $Id: packet-isl.c,v 1.20 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -342,7 +342,7 @@ proto_register_isl(void)
 	&ett_isl,
   };
 
-  proto_isl = proto_register_protocol("Cisco ISL", "isl");
+  proto_isl = proto_register_protocol("Cisco ISL", "ISL", "isl");
   proto_register_field_array(proto_isl, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-kerberos.c b/packet-kerberos.c
index b83fedc57d..8fa584fcc3 100644
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -3,7 +3,7 @@
  * Wes Hardaker (c) 2000
  * wjhardaker@ucdavis.edu
  *
- * $Id: packet-kerberos.c,v 1.11 2000/12/26 16:44:43 nneul Exp $
+ * $Id: packet-kerberos.c,v 1.12 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1292,7 +1292,7 @@ proto_register_kerberos(void) {
         &ett_addresses,
         &ett_etype,
     };
-    proto_kerberos = proto_register_protocol("Kerberos", "kerberos");
+    proto_kerberos = proto_register_protocol("Kerberos", "KRB5", "kerberos");
 /*
     proto_register_field_array(proto_kerberos, hf, array_length(hf));
 */
diff --git a/packet-l2tp.c b/packet-l2tp.c
index 4f698efcee..57e25869e1 100644
--- a/packet-l2tp.c
+++ b/packet-l2tp.c
@@ -7,7 +7,7 @@
  * Laurent Cazalet <laurent.cazalet@mailclub.net>
  * Thomas Parvais <thomas.parvais@advalvas.be>
  *
- * $Id: packet-l2tp.c,v 1.17 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-l2tp.c,v 1.18 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -822,7 +822,7 @@ proto_register_l2tp(void)
 	};
 
 	proto_l2tp = proto_register_protocol(
-		"Layer 2 Tunneling Protocol", "l2tp");
+		"Layer 2 Tunneling Protocol", "L2TP", "l2tp");
 	proto_register_field_array(proto_l2tp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-lapb.c b/packet-lapb.c
index 0c3b1a6459..f38e78aab0 100644
--- a/packet-lapb.c
+++ b/packet-lapb.c
@@ -2,7 +2,7 @@
  * Routines for lapb frame disassembly
  * Olivier Abad <oabad@cybercable.fr>
  *
- * $Id: packet-lapb.c,v 1.25 2000/12/29 02:27:21 guy Exp $
+ * $Id: packet-lapb.c,v 1.26 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -131,7 +131,8 @@ proto_register_lapb(void)
         &ett_lapb_control,
     };
 
-    proto_lapb = proto_register_protocol ("Link Access Procedure Balanced (LAPB)", "lapb");
+    proto_lapb = proto_register_protocol("Link Access Procedure Balanced (LAPB)",
+					 "LAPB", "lapb");
     proto_register_field_array (proto_lapb, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-lapbether.c b/packet-lapbether.c
index 36ded13088..784ed3c8de 100644
--- a/packet-lapbether.c
+++ b/packet-lapbether.c
@@ -3,7 +3,7 @@
  * Richard Sharpe <rsharpe@ns.aus.com> based on the lapb module by
  * Olivier Abad <oabad@cybercable.fr>
  *
- * $Id: packet-lapbether.c,v 1.2 2000/12/29 02:27:21 guy Exp $
+ * $Id: packet-lapbether.c,v 1.3 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -92,7 +92,8 @@ proto_register_lapbether(void)
         &ett_lapbether,
     };
 
-    proto_lapbether = proto_register_protocol ("Link Access Procedure Balanced Ethernet (LAPBETHER)", "lapbether");
+    proto_lapbether = proto_register_protocol ("Link Access Procedure Balanced Ethernet (LAPBETHER)",
+        "LAPBETHER", "lapbether");
     proto_register_field_array (proto_lapbether, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-lapd.c b/packet-lapd.c
index 7941c6c090..5c30b71b28 100644
--- a/packet-lapd.c
+++ b/packet-lapd.c
@@ -2,7 +2,7 @@
  * Routines for LAPD frame disassembly
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-lapd.c,v 1.17 2000/11/29 05:16:15 gram Exp $
+ * $Id: packet-lapd.c,v 1.18 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -197,7 +197,8 @@ proto_register_lapd(void)
         &ett_lapd_control,
     };
 
-    proto_lapd = proto_register_protocol ("Link Access Procedure, Channel D (LAPD)", "lapd");
+    proto_lapd = proto_register_protocol("Link Access Procedure, Channel D (LAPD)",
+					 "LAPD", "lapd");
     proto_register_field_array (proto_lapd, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ldap.c b/packet-ldap.c
index 06552f1e7b..1c9f1d06a1 100644
--- a/packet-ldap.c
+++ b/packet-ldap.c
@@ -1,7 +1,7 @@
 /* packet-ldap.c
  * Routines for ldap packet dissection
  *
- * $Id: packet-ldap.c,v 1.18 2000/12/24 09:10:12 guy Exp $
+ * $Id: packet-ldap.c,v 1.19 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1195,7 +1195,8 @@ proto_register_ldap(void)
     &ett_ldap_attribute
   };
 
-  proto_ldap = proto_register_protocol("Lightweight Directory Access Protocol", "ldap");
+  proto_ldap = proto_register_protocol("Lightweight Directory Access Protocol",
+				       "LDAP", "ldap");
   proto_register_field_array(proto_ldap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ldp.c b/packet-ldp.c
index 046c440646..ac73c02a19 100644
--- a/packet-ldp.c
+++ b/packet-ldp.c
@@ -1,7 +1,7 @@
 /* packet-ldp.c
  * Routines for ldp packet disassembly
  *
- * $Id: packet-ldp.c,v 1.10 2000/12/04 13:40:11 sharpe Exp $
+ * $Id: packet-ldp.c,v 1.11 2001/01/03 06:55:29 guy Exp $
  * 
  * Copyright (c) November 2000 by Richard Sharpe <rsharpe@ns.aus.com>
  *
@@ -804,7 +804,7 @@ proto_register_ldp(void)
 				 10, &global_ldp_udp_port);
 
   proto_ldp = proto_register_protocol("Label Distribution Protocol",
-				       "ldp");
+				       "LDP", "ldp");
 
   proto_register_field_array(proto_ldp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-llc.c b/packet-llc.c
index 5e0ed63b04..54a1829f87 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
  * Routines for IEEE 802.2 LLC layer
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-llc.c,v 1.73 2000/12/28 09:49:09 guy Exp $
+ * $Id: packet-llc.c,v 1.74 2001/01/03 06:55:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -382,7 +382,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		case OUI_CABLE_BPDU:    /* DOCSIS cable modem spanning tree BPDU */
 			if (tree) {
 				proto_tree_add_uint(llc_tree,
-				hf_llc_pid, tvb, 6, 2, etype);
+				    hf_llc_pid, tvb, 6, 2, etype);
 			}
 			call_dissector(bpdu_handle, next_tvb, pinfo, tree);
 			break;
@@ -468,7 +468,7 @@ proto_register_llc(void)
 		&ett_llc_ctrl,
 	};
 
-	proto_llc = proto_register_protocol ("Logical-Link Control", "llc" );
+	proto_llc = proto_register_protocol("Logical-Link Control", "LLC", "llc");
 	proto_register_field_array(proto_llc, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-lpd.c b/packet-lpd.c
index 1a521f108c..02cc88c822 100644
--- a/packet-lpd.c
+++ b/packet-lpd.c
@@ -2,7 +2,7 @@
  * Routines for LPR and LPRng packet disassembly
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-lpd.c,v 1.23 2000/11/19 08:53:59 guy Exp $
+ * $Id: packet-lpd.c,v 1.24 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -194,7 +194,7 @@ proto_register_lpd(void)
     &ett_lpd,
   };
 
-  proto_lpd = proto_register_protocol("Line Printer Daemon Protocol", "lpd");
+  proto_lpd = proto_register_protocol("Line Printer Daemon Protocol", "LPD", "lpd");
   proto_register_field_array(proto_lpd, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-mapi.c b/packet-mapi.c
index cf0c2573da..40ebbce7b4 100644
--- a/packet-mapi.c
+++ b/packet-mapi.c
@@ -1,7 +1,7 @@
 /* packet-mapi.c
  * Routines for MSX mapi packet dissection
  *
- * $Id: packet-mapi.c,v 1.11 2000/12/29 05:15:37 guy Exp $
+ * $Id: packet-mapi.c,v 1.12 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -109,7 +109,7 @@ proto_register_mapi(void)
 	static gint *ett[] = {
 		&ett_mapi,
 	};
-	proto_mapi = proto_register_protocol("MAPI", "mapi");
+	proto_mapi = proto_register_protocol("MAPI", "MAPI", "mapi");
 	proto_register_field_array(proto_mapi, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-mip.c b/packet-mip.c
index a6d398d20e..30839ecc2a 100644
--- a/packet-mip.c
+++ b/packet-mip.c
@@ -2,7 +2,7 @@
  * Routines for Mobile IP dissection
  * Copyright 2000, Stefan Raab <Stefan.Raab@nextel.com>
  *
- * $Id: packet-mip.c,v 1.9 2000/11/19 08:54:00 guy Exp $
+ * $Id: packet-mip.c,v 1.10 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -287,7 +287,7 @@ void proto_register_mip(void)
 	};
 
 /* Register the protocol name and description */
-	proto_mip = proto_register_protocol("Mobile IP", "mip");
+	proto_mip = proto_register_protocol("Mobile IP", "Mobile IP", "mip");
 
 /* Required function calls to register the header fields and subtrees used */
 	proto_register_field_array(proto_mip, hf, array_length(hf));
diff --git a/packet-mount.c b/packet-mount.c
index 8915de0fba..2369b52062 100644
--- a/packet-mount.c
+++ b/packet-mount.c
@@ -1,7 +1,7 @@
 /* packet-mount.c
  * Routines for mount dissection
  *
- * $Id: packet-mount.c,v 1.17 2000/08/14 11:36:03 girlich Exp $
+ * $Id: packet-mount.c,v 1.18 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -690,7 +690,7 @@ proto_register_mount(void)
 		&ett_mount_pathconf_mask,
 	};
 
-	proto_mount = proto_register_protocol("Mount Service", "mount");
+	proto_mount = proto_register_protocol("Mount Service", "MOUNT", "mount");
 	proto_register_field_array(proto_mount, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-mpls.c b/packet-mpls.c
index 1ff1242714..cef22a446a 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.12 2000/12/14 08:20:29 guy Exp $
+ * $Id: packet-mpls.c,v 1.13 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -191,7 +191,8 @@ proto_register_mpls(void)
 		&ett_mpls,
 	};
 
-	proto_mpls = proto_register_protocol("MultiProtocol Label Switching Header", "mpls");
+	proto_mpls = proto_register_protocol("MultiProtocol Label Switching Header",
+	    "MPLS", "mpls");
 	proto_register_field_array(proto_mpls, mplsf_info, array_length(mplsf_info));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-msproxy.c b/packet-msproxy.c
index dfd162ea37..58f15bb155 100644
--- a/packet-msproxy.c
+++ b/packet-msproxy.c
@@ -2,7 +2,7 @@
  * Routines for Microsoft Proxy packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-msproxy.c,v 1.14 2000/11/19 08:54:00 guy Exp $
+ * $Id: packet-msproxy.c,v 1.15 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1339,7 +1339,8 @@ proto_register_msproxy( void){
 
 	};
 
-   	proto_msproxy = proto_register_protocol ( "MSProxy Protocol", "msproxy");           
+   	proto_msproxy = proto_register_protocol( "MS Proxy Protocol",
+	    "MS Proxy", "msproxy");
 
 	proto_register_field_array(proto_msproxy, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));  
diff --git a/packet-nbipx.c b/packet-nbipx.c
index 0170c021d4..ca218d1a82 100644
--- a/packet-nbipx.c
+++ b/packet-nbipx.c
@@ -2,7 +2,7 @@
  * Routines for NetBIOS over IPX packet disassembly
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-nbipx.c,v 1.32 2000/12/29 04:16:57 guy Exp $
+ * $Id: packet-nbipx.c,v 1.33 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -471,7 +471,8 @@ proto_register_nbipx(void)
 		&ett_nbipx_name_type_flags,
 	};
 
-        proto_nbipx = proto_register_protocol("NetBIOS over IPX", "nbipx");
+        proto_nbipx = proto_register_protocol("NetBIOS over IPX",
+	    "NBIPX", "nbipx");
  /*       proto_register_field_array(proto_nbipx, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-nbns.c b/packet-nbns.c
index 2bd7aa04bb..035b0888da 100644
--- a/packet-nbns.c
+++ b/packet-nbns.c
@@ -4,7 +4,7 @@
  * Gilbert Ramirez <gram@xiexie.org>
  * Much stuff added by Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-nbns.c,v 1.48 2000/11/19 16:58:57 gerald Exp $
+ * $Id: packet-nbns.c,v 1.49 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1754,13 +1754,15 @@ proto_register_nbt(void)
     &ett_nbss_flags,
   };
 
-  proto_nbns = proto_register_protocol("NetBIOS Name Service", "nbns");
+  proto_nbns = proto_register_protocol("NetBIOS Name Service", "NBNS", "nbns");
   proto_register_field_array(proto_nbns, hf_nbns, array_length(hf_nbns));
   
-  proto_nbdgm = proto_register_protocol("NetBIOS Datagram Service", "nbdgm");
+  proto_nbdgm = proto_register_protocol("NetBIOS Datagram Service",
+					"NBDS", "nbdgm");
   proto_register_field_array(proto_nbdgm, hf_nbdgm, array_length(hf_nbdgm));
 
-  proto_nbss = proto_register_protocol("NetBIOS Session Service", "nbss");
+  proto_nbss = proto_register_protocol("NetBIOS Session Service",
+				       "NBSS", "nbss");
   proto_register_field_array(proto_nbss, hf_nbss, array_length(hf_nbss));
 
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-ncp.c b/packet-ncp.c
index ccd19618b8..b0d3dd4ed5 100644
--- a/packet-ncp.c
+++ b/packet-ncp.c
@@ -3,7 +3,7 @@
  * Gilbert Ramirez <gram@xiexie.org>
  * Modified to allow NCP over TCP/IP decodes by James Coe <jammer@cin.net>
  *
- * $Id: packet-ncp.c,v 1.42 2000/12/29 04:16:57 guy Exp $
+ * $Id: packet-ncp.c,v 1.43 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -382,7 +382,7 @@ proto_register_ncp(void)
   };
   module_t *ncp_module;
 
-  proto_ncp = proto_register_protocol("NetWare Core Protocol", "ncp");
+  proto_ncp = proto_register_protocol("NetWare Core Protocol", "NCP", "ncp");
   proto_register_field_array(proto_ncp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
   register_init_routine(&ncp_init_protocol);
diff --git a/packet-netbios.c b/packet-netbios.c
index 4ddd861cae..4b828c92ab 100644
--- a/packet-netbios.c
+++ b/packet-netbios.c
@@ -5,7 +5,7 @@
  * 
  * derived from the packet-nbns.c
  *
- * $Id: packet-netbios.c,v 1.27 2000/12/03 09:47:18 guy Exp $
+ * $Id: packet-netbios.c,v 1.28 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1164,7 +1164,7 @@ void proto_register_netbios(void)
 			"" }},
 		};
 
-	proto_netbios = proto_register_protocol("NetBIOS", "netbios");
+	proto_netbios = proto_register_protocol("NetBIOS", "NetBIOS", "netbios");
 	proto_register_subtree_array(ett, array_length(ett));                 
 	proto_register_field_array(proto_netbios, hf_netb, array_length(hf_netb));
 }
diff --git a/packet-nfs.c b/packet-nfs.c
index b6687a7f5c..30e0240ddc 100644
--- a/packet-nfs.c
+++ b/packet-nfs.c
@@ -3,7 +3,7 @@
  * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
  * Copyright 2000, Mike Frisch <frisch@hummingbird.com> (NFSv4 decoding)
  *
- * $Id: packet-nfs.c,v 1.39 2000/12/01 00:38:18 guy Exp $
+ * $Id: packet-nfs.c,v 1.40 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -5329,7 +5329,7 @@ proto_register_nfs(void)
 		&ett_nfs_client_id4,
 		&ett_nfs_bitmap4
 	};
-	proto_nfs = proto_register_protocol("Network File System", "nfs");
+	proto_nfs = proto_register_protocol("Network File System", "NFS", "nfs");
 	proto_register_field_array(proto_nfs, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-nlm.c b/packet-nlm.c
index b9d204d2a9..1f55243d4e 100644
--- a/packet-nlm.c
+++ b/packet-nlm.c
@@ -1,7 +1,7 @@
 /* packet-nlm.c
  * Routines for nlm dissection
  *
- * $Id: packet-nlm.c,v 1.9 2000/08/14 11:36:02 girlich Exp $
+ * $Id: packet-nlm.c,v 1.10 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -381,7 +381,8 @@ proto_register_nlm(void)
 		&ett_nlm_lock,
 	};
 
-	proto_nlm = proto_register_protocol("Network Lock Manager Protocol", "nlm");
+	proto_nlm = proto_register_protocol("Network Lock Manager Protocol",
+	    "NLM", "nlm");
 	proto_register_field_array(proto_nlm, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-nntp.c b/packet-nntp.c
index fcb99fe719..a13e0f62d6 100644
--- a/packet-nntp.c
+++ b/packet-nntp.c
@@ -2,7 +2,7 @@
  * Routines for nntp packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-nntp.c,v 1.16 2000/11/19 08:54:00 guy Exp $
+ * $Id: packet-nntp.c,v 1.17 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -141,7 +141,7 @@ proto_register_nntp(void)
 	};
 
 	proto_nntp = proto_register_protocol("Network News Transfer Protocol", 
-				       "nntp");
+	    "NNTP", "nntp");
 	proto_register_field_array(proto_nntp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ntp.c b/packet-ntp.c
index 19bd15b9a8..0efca8296b 100644
--- a/packet-ntp.c
+++ b/packet-ntp.c
@@ -2,7 +2,7 @@
  * Routines for NTP packet dissection
  * Copyright 1999, Nathan Neulinger <nneul@umr.edu>
  *
- * $Id: packet-ntp.c,v 1.20 2000/11/19 21:18:10 gerald Exp $
+ * $Id: packet-ntp.c,v 1.21 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -437,7 +437,7 @@ proto_register_ntp(void)
 		&ett_ntp_flags,
 	};
 
-	proto_ntp = proto_register_protocol("Network Time Protocol", "ntp");
+	proto_ntp = proto_register_protocol("Network Time Protocol", "NTP", "ntp");
 	proto_register_field_array(proto_ntp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-null.c b/packet-null.c
index a6f14e30df..9e7bd53b8e 100644
--- a/packet-null.c
+++ b/packet-null.c
@@ -1,7 +1,7 @@
 /* packet-null.c
  * Routines for null packet disassembly
  *
- * $Id: packet-null.c,v 1.36 2000/12/02 08:41:07 guy Exp $
+ * $Id: packet-null.c,v 1.37 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -307,7 +307,7 @@ proto_register_null(void)
 		&ett_null,
 	};
 
-	proto_null = proto_register_protocol ("Null/Loopback", "null" );
+	proto_null = proto_register_protocol("Null/Loopback", "Null", "null");
 	proto_register_field_array(proto_null, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-ospf.c b/packet-ospf.c
index b90cde292d..e353956e25 100644
--- a/packet-ospf.c
+++ b/packet-ospf.c
@@ -2,7 +2,7 @@
  * Routines for OSPF packet disassembly
  * (c) Copyright Hannes R. Boehm <hannes@boehm.org>
  *
- * $Id: packet-ospf.c,v 1.32 2000/12/28 00:44:49 guy Exp $
+ * $Id: packet-ospf.c,v 1.33 2001/01/03 06:55:30 guy Exp $
  *
  * At this time, this module is able to analyze OSPF
  * packets as specified in RFC2328. MOSPF (RFC1584) and other
@@ -1043,7 +1043,8 @@ proto_register_ospf(void)
 	&ett_ospf_lsa_mpls_link_stlv
     };
 
-    proto_ospf = proto_register_protocol("Open Shortest Path First", "ospf");
+    proto_ospf = proto_register_protocol("Open Shortest Path First",
+					 "OSPF", "ospf");
  /*       proto_register_field_array(proto_ospf, hf, array_length(hf));*/
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-pim.c b/packet-pim.c
index 86a31cf4d7..77fb2d676f 100644
--- a/packet-pim.c
+++ b/packet-pim.c
@@ -2,7 +2,7 @@
  * Routines for PIM disassembly
  * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
  *
- * $Id: packet-pim.c,v 1.19 2000/11/18 10:38:25 guy Exp $
+ * $Id: packet-pim.c,v 1.20 2001/01/03 06:55:30 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -600,7 +600,7 @@ proto_register_pim(void)
     };
 
     proto_pim = proto_register_protocol("Protocol Independent Multicast",
-	"pim");
+	"PIM", "pim");
     proto_register_field_array(proto_pim, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-pop.c b/packet-pop.c
index 0aa5dd7b9f..13b494154a 100644
--- a/packet-pop.c
+++ b/packet-pop.c
@@ -2,7 +2,7 @@
  * Routines for pop packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-pop.c,v 1.21 2000/11/19 08:54:01 guy Exp $
+ * $Id: packet-pop.c,v 1.22 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -214,7 +214,7 @@ proto_register_pop(void)
     &ett_pop,
   };
 
-  proto_pop = proto_register_protocol("Post Office Protocol", "pop");
+  proto_pop = proto_register_protocol("Post Office Protocol", "POP", "pop");
   proto_register_field_array(proto_pop, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-portmap.c b/packet-portmap.c
index e61298679c..800621f2ac 100644
--- a/packet-portmap.c
+++ b/packet-portmap.c
@@ -1,7 +1,7 @@
 /* packet-portmap.c
  * Routines for portmap dissection
  *
- * $Id: packet-portmap.c,v 1.20 2000/08/24 23:16:16 guy Exp $
+ * $Id: packet-portmap.c,v 1.21 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -433,7 +433,7 @@ proto_register_portmap(void)
 		&ett_portmap_entry
 	};
 
-	proto_portmap = proto_register_protocol("Portmap", "portmap");
+	proto_portmap = proto_register_protocol("Portmap", "Portmap", "portmap");
 	proto_register_field_array(proto_portmap, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ppp.c b/packet-ppp.c
index 0055dc1fba..97acc34a63 100644
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -1,7 +1,7 @@
 /* packet-ppp.c
  * Routines for ppp packet disassembly
  *
- * $Id: packet-ppp.c,v 1.48 2000/12/14 08:20:29 guy Exp $
+ * $Id: packet-ppp.c,v 1.49 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1408,16 +1408,17 @@ proto_register_ppp(void)
 		&ett_lcp_internationalization_opt,
 	};
 
-    static enum_val_t ppp_options[] = {
-    	{"None", 0}, 
-    	{"16-Bit", 1}, 
-    	{"32-Bit", 2},
-    	{NULL, -1}
-    };
+	static enum_val_t ppp_options[] = {
+		{"None", 0}, 
+		{"16-Bit", 1}, 
+		{"32-Bit", 2},
+		{NULL, -1}
+	};
     
-    module_t *ppp_module;
+	module_t *ppp_module;
 
-        proto_ppp = proto_register_protocol("Point-to-Point Protocol", "ppp");
+        proto_ppp = proto_register_protocol("Point-to-Point Protocol",
+	    "PPP", "ppp");
  /*       proto_register_field_array(proto_ppp, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 
@@ -1431,11 +1432,11 @@ proto_register_ppp(void)
 	ppp_module = prefs_register_module("ppp", "PPP", NULL);
 
 	prefs_register_enum_preference(ppp_module, 
-	"ppp_fcs",
-	"PPP Frame Checksum",
-    "PPP Frame Checksum", 
-    &ppp_fcs_decode,
-    ppp_options, FALSE);
+	    "ppp_fcs",
+	    "PPP Frame Checksum",
+	    "PPP Frame Checksum", 
+	    &ppp_fcs_decode,
+	    ppp_options, FALSE);
 }
 
 void
@@ -1459,7 +1460,7 @@ proto_register_mp(void)
     &ett_mp_flags,
   };
 
-  proto_mp = proto_register_protocol("PPP Multilink Protocol", "mp");
+  proto_mp = proto_register_protocol("PPP Multilink Protocol", "PPP MP", "mp");
   proto_register_field_array(proto_mp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
@@ -1467,6 +1468,6 @@ proto_register_mp(void)
 void
 proto_reg_handoff_ppp(void)
 {
-	dissector_add("wtap_encap", WTAP_ENCAP_PPP, dissect_ppp);
-	dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, dissect_ppp);
+  dissector_add("wtap_encap", WTAP_ENCAP_PPP, dissect_ppp);
+  dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, dissect_ppp);
 }
diff --git a/packet-pptp.c b/packet-pptp.c
index 1ce0c1a2ba..168e40d6db 100644
--- a/packet-pptp.c
+++ b/packet-pptp.c
@@ -2,7 +2,7 @@
  * Routines for the Point-to-Point Tunnelling Protocol (PPTP) (RFC 2637)
  * Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
  *
- * $Id: packet-pptp.c,v 1.15 2000/12/29 04:41:30 guy Exp $
+ * $Id: packet-pptp.c,v 1.16 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -824,7 +824,7 @@ proto_register_pptp(void)
   };
 
   proto_pptp = proto_register_protocol("Point-to-Point Tunnelling Protocol",
-				       "pptp");
+				       "PPTP", "pptp");
   proto_register_field_array(proto_pptp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-q2931.c b/packet-q2931.c
index 41fb70762e..50566fe3aa 100644
--- a/packet-q2931.c
+++ b/packet-q2931.c
@@ -2,7 +2,7 @@
  * Routines for Q.2931 frame disassembly
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-q2931.c,v 1.13 2000/11/19 08:54:03 guy Exp $
+ * $Id: packet-q2931.c,v 1.14 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -2128,7 +2128,7 @@ proto_register_q2931(void)
 		&ett_q2931_nsap,
 	};
 
-	proto_q2931 = proto_register_protocol ("Q.2931", "q2931");
+	proto_q2931 = proto_register_protocol("Q.2931", "Q.2931", "q2931");
 	proto_register_field_array (proto_q2931, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-q931.c b/packet-q931.c
index 28cac41a44..9a80c4bee6 100644
--- a/packet-q931.c
+++ b/packet-q931.c
@@ -2,7 +2,7 @@
  * Routines for Q.931 frame disassembly
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-q931.c,v 1.21 2000/11/19 08:54:03 guy Exp $
+ * $Id: packet-q931.c,v 1.22 2001/01/03 06:55:31 guy Exp $
  *
  * Modified by Andreas Sikkema for possible use with H.323
  *
@@ -2634,7 +2634,7 @@ proto_register_q931(void)
 		&ett_q931_ie,
 	};
 
-	proto_q931 = proto_register_protocol ("Q.931", "q931");
+	proto_q931 = proto_register_protocol("Q.931", "Q.931", "q931");
 	proto_register_field_array (proto_q931, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-quake.c b/packet-quake.c
index 9679018441..ecd4f3f3bb 100644
--- a/packet-quake.c
+++ b/packet-quake.c
@@ -4,7 +4,7 @@
  * Uwe Girlich <uwe@planetquake.com>
  *	http://www.idsoftware.com/q1source/q1source.zip
  *
- * $Id: packet-quake.c,v 1.10 2000/12/02 08:41:08 guy Exp $
+ * $Id: packet-quake.c,v 1.11 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -708,7 +708,8 @@ proto_register_quake(void)
     &ett_quake_flags,
   };
 
-  proto_quake = proto_register_protocol("Quake Network Protocol", "quake");
+  proto_quake = proto_register_protocol("Quake Network Protocol",
+					"QUAKE", "quake");
   proto_register_field_array(proto_quake, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
@@ -717,5 +718,5 @@ proto_register_quake(void)
 void
 proto_reg_handoff_quake(void)
 {
-	dissector_add("udp.port", DEFAULTnet_hostport, dissect_quake);
+  dissector_add("udp.port", DEFAULTnet_hostport, dissect_quake);
 }
diff --git a/packet-radius.c b/packet-radius.c
index 5cce95e0fa..9751fff1ee 100644
--- a/packet-radius.c
+++ b/packet-radius.c
@@ -1,7 +1,7 @@
 /* packet-radius.c
  * Routines for RADIUS packet disassembly
  *
- * $Id: packet-radius.c,v 1.20 2000/11/28 06:29:17 guy Exp $
+ * $Id: packet-radius.c,v 1.21 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Johan Feyaerts
@@ -775,7 +775,8 @@ proto_register_radius(void)
 		&ett_radius_avp,
 	};
 
-	proto_radius = proto_register_protocol ("Radius Protocol", "radius");
+	proto_radius = proto_register_protocol("Radius Protocol", "RADIUS",
+	    "radius");
 	proto_register_field_array(proto_radius, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-rip.c b/packet-rip.c
index e688ac57f8..732cc2e551 100644
--- a/packet-rip.c
+++ b/packet-rip.c
@@ -2,7 +2,7 @@
  * Routines for RIPv1 and RIPv2 packet disassembly
  * (c) Copyright Hannes R. Boehm <hannes@boehm.org>
  *
- * $Id: packet-rip.c,v 1.20 2000/12/27 12:48:25 guy Exp $
+ * $Id: packet-rip.c,v 1.21 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -193,22 +193,23 @@ dissect_rip_authentication(tvbuff_t *tvb, int offset, proto_tree *tree)
 void
 proto_register_rip(void)
 {
-/*        static hf_register_info hf[] = {
-                { &variable,
-                { "Name",           "rip.abbreviation", TYPE, VALS_POINTER }},
-        };*/
-	static gint *ett[] = {
-		&ett_rip,
-		&ett_rip_vec,
-	};
-
-        proto_rip = proto_register_protocol("Routing Information Protocol", "rip");
- /*       proto_register_field_array(proto_rip, hf, array_length(hf));*/
-	proto_register_subtree_array(ett, array_length(ett));
+/*  static hf_register_info hf[] = {
+	{ &variable,
+	{ "Name",           "rip.abbreviation", TYPE, VALS_POINTER }},
+    };*/
+    static gint *ett[] = {
+	&ett_rip,
+	&ett_rip_vec,
+    };
+
+    proto_rip = proto_register_protocol("Routing Information Protocol",
+					"RIP", "rip");
+/*  proto_register_field_array(proto_rip, hf, array_length(hf));*/
+    proto_register_subtree_array(ett, array_length(ett));
 }
 
 void
 proto_reg_handoff_rip(void)
 {
-	dissector_add("udp.port", UDP_PORT_RIP, dissect_rip);
+    dissector_add("udp.port", UDP_PORT_RIP, dissect_rip);
 }
diff --git a/packet-ripng.c b/packet-ripng.c
index 739d64a659..6f97c7efb5 100644
--- a/packet-ripng.c
+++ b/packet-ripng.c
@@ -3,7 +3,7 @@
  * (c) Copyright Jun-ichiro itojun Hagino <itojun@itojun.org>
  * derived from packet-rip.c
  *
- * $Id: packet-ripng.c,v 1.15 2000/11/17 21:00:36 gram Exp $
+ * $Id: packet-ripng.c,v 1.16 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -151,7 +151,7 @@ proto_register_ripng(void)
       &ett_ripng_addr,
     };
 
-    proto_ripng = proto_register_protocol("RIPng", "ripng");
+    proto_ripng = proto_register_protocol("RIPng", "RIPng", "ripng");
     proto_register_field_array(proto_ripng, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-rlogin.c b/packet-rlogin.c
index e0b2558c6e..33a10dedc0 100644
--- a/packet-rlogin.c
+++ b/packet-rlogin.c
@@ -2,7 +2,7 @@
  * Routines for unix rlogin packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-rlogin.c,v 1.11 2000/11/19 08:54:04 guy Exp $
+ * $Id: packet-rlogin.c,v 1.12 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -480,7 +480,7 @@ proto_register_rlogin( void){
 	
 
    	proto_rlogin = proto_register_protocol (
-   		"Rlogin Protocol", "rlogin");           
+   		"Rlogin Protocol", "Rlogin", "rlogin");
 
 	proto_register_field_array(proto_rlogin, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));  
diff --git a/packet-rpc.c b/packet-rpc.c
index 0b509cfe76..4881de4229 100644
--- a/packet-rpc.c
+++ b/packet-rpc.c
@@ -2,7 +2,7 @@
  * Routines for rpc dissection
  * Copyright 1999, Uwe Girlich <Uwe.Girlich@philosys.de>
  * 
- * $Id: packet-rpc.c,v 1.45 2000/11/22 01:39:10 guy Exp $
+ * $Id: packet-rpc.c,v 1.46 2001/01/03 06:55:31 guy Exp $
  * 
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -268,7 +268,6 @@ rpc_init_prog(int proto, guint32 prog, int ett)
 {
 	rpc_prog_info_key *key;
 	rpc_prog_info_value *value;
-	char *uc_progname = NULL, *lc_progname = NULL;
 
 	key = (rpc_prog_info_key *) g_malloc(sizeof(rpc_prog_info_key));
 	key->prog = prog;
@@ -276,18 +275,7 @@ rpc_init_prog(int proto, guint32 prog, int ett)
 	value = (rpc_prog_info_value *) g_malloc(sizeof(rpc_prog_info_value));
 	value->proto = proto;
 	value->ett = ett;
-
-	lc_progname = proto_registrar_get_abbrev(proto);
-	if ( lc_progname )
-	{
-		int i;
-		uc_progname = strdup(lc_progname);
-		for (i=0; i<strlen(uc_progname); i++)
-		{
-			uc_progname[i] = toupper(uc_progname[i]);
-		}
-	}
-	value->progname = uc_progname;
+	value->progname = proto_get_protocol_short_name(proto);
 
 	g_hash_table_insert(rpc_progs,key,value);
 }
@@ -1759,7 +1747,8 @@ proto_register_rpc(void)
 		&ett_rpc_gids,
 	};
 
-	proto_rpc = proto_register_protocol("Remote Procedure Call", "rpc");
+	proto_rpc = proto_register_protocol("Remote Procedure Call",
+	    "RPC", "rpc");
 	proto_register_field_array(proto_rpc, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 	register_init_routine(&rpc_init_protocol);
@@ -1786,5 +1775,3 @@ proto_reg_handoff_rpc(void)
 	heur_dissector_add("tcp", dissect_rpc);
 	heur_dissector_add("udp", dissect_rpc);
 }
-
-
diff --git a/packet-rsh.c b/packet-rsh.c
index 93e0eb196a..dd23920673 100644
--- a/packet-rsh.c
+++ b/packet-rsh.c
@@ -4,7 +4,7 @@
  * Robert Tsai <rtsai@netapp.com>
  * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-rsh.c,v 1.7 2000/11/19 08:54:04 guy Exp $
+ * $Id: packet-rsh.c,v 1.8 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -121,7 +121,7 @@ proto_register_rsh(void)
 		&ett_rsh,
 	};
 
-	proto_rsh = proto_register_protocol("Remote Shell", "rsh");
+	proto_rsh = proto_register_protocol("Remote Shell", "RSH", "rsh");
 	proto_register_field_array(proto_rsh, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-rsvp.c b/packet-rsvp.c
index 79cf9eae76..e277cff052 100644
--- a/packet-rsvp.c
+++ b/packet-rsvp.c
@@ -3,7 +3,7 @@
  *
  * (c) Copyright Ashok Narayanan <ashokn@cisco.com>
  *
- * $Id: packet-rsvp.c,v 1.28 2000/11/19 08:54:04 guy Exp $
+ * $Id: packet-rsvp.c,v 1.29 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -2027,7 +2027,8 @@ proto_register_rsvp(void)
 		&ett_rsvp_unknown_class,
 	};
 
-        proto_rsvp = proto_register_protocol("Resource ReserVation Protocol (RSVP)", "rsvp");
+        proto_rsvp = proto_register_protocol("Resource ReserVation Protocol (RSVP)",
+	    "RSVP", "rsvp");
         proto_register_field_array(proto_rsvp, rsvpf_info, array_length(rsvpf_info));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-rtcp.c b/packet-rtcp.c
index 481ce9304d..277ca5c1a2 100644
--- a/packet-rtcp.c
+++ b/packet-rtcp.c
@@ -179,6 +179,9 @@ static int heur_init = FALSE;
 
 static char rtcp_proto[] = "RTCP";
 
+static gboolean dissect_rtcp_heur( tvbuff_t *tvb, packet_info *pinfo,
+    proto_tree *tree );
+
 void rtcp_add_address( const unsigned char* ip_addr, int prt )
 {
 	address src_addr;
@@ -231,7 +234,7 @@ static void rtcp_init( void )
 }
 #endif
 
-gboolean
+static gboolean
 dissect_rtcp_heur( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
 {
 	conversation_t* pconv;
@@ -1206,7 +1209,8 @@ proto_register_rtcp(void)
 	};
 
 
-	proto_rtcp = proto_register_protocol("Real-time Transport Control Protocol", "rtcp");
+	proto_rtcp = proto_register_protocol("Real-time Transport Control Protocol",
+	    "RTCP", "rtcp");
 	proto_register_field_array(proto_rtcp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-rtcp.h b/packet-rtcp.h
index a2eba6aaf3..e34de9125a 100644
--- a/packet-rtcp.h
+++ b/packet-rtcp.h
@@ -27,6 +27,5 @@
  */
 
 void     rtcp_add_address   ( const unsigned char* ip_addr, int prt );
-gboolean dissect_rtcp_heur  ( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
 void     dissect_rtcp       ( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree );
 void     proto_register_rtcp( void );
diff --git a/packet-rtp.c b/packet-rtp.c
index 628b19dbec..b7bca40996 100644
--- a/packet-rtp.c
+++ b/packet-rtp.c
@@ -620,7 +620,8 @@ proto_register_rtp(void)
 	};
 
 
-	proto_rtp = proto_register_protocol("Real-Time Transport Protocol", "rtp");
+	proto_rtp = proto_register_protocol("Real-Time Transport Protocol",
+	    "RTP", "rtp");
 	proto_register_field_array(proto_rtp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-rtsp.c b/packet-rtsp.c
index debd9b41f0..78682eb94b 100644
--- a/packet-rtsp.c
+++ b/packet-rtsp.c
@@ -4,7 +4,7 @@
  * Jason Lango <jal@netapp.com>
  * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-rtsp.c,v 1.30 2000/12/27 12:48:25 guy Exp $
+ * $Id: packet-rtsp.c,v 1.31 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -612,7 +612,7 @@ proto_register_rtsp(void)
 	};
 
         proto_rtsp = proto_register_protocol("Real Time Streaming Protocol",
-		"rtsp");
+		"RTSP", "rtsp");
 	proto_register_field_array(proto_rtsp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-rx.c b/packet-rx.c
index 8561d58366..544ad2cd33 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.15 2000/11/19 08:54:05 guy Exp $
+ * $Id: packet-rx.c,v 1.16 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -239,7 +239,7 @@ proto_register_rx(void)
 		&ett_rx_flags,
 	};
 
-	proto_rx = proto_register_protocol("RX Protocol", "rx");
+	proto_rx = proto_register_protocol("RX Protocol", "RX", "rx");
 	proto_register_field_array(proto_rx, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-sap.c b/packet-sap.c
index a10ba06342..3125ddd8be 100644
--- a/packet-sap.c
+++ b/packet-sap.c
@@ -4,7 +4,7 @@
  *
  * Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-sap.c,v 1.16 2000/11/19 21:01:06 guy Exp $
+ * $Id: packet-sap.c,v 1.17 2001/01/03 06:55:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -357,7 +357,8 @@ void proto_register_sap(void)
     &ett_sap_authf,
   };
 
-  proto_sap = proto_register_protocol("Session Announcement Protocol", "sap");
+  proto_sap = proto_register_protocol("Session Announcement Protocol", "SAP",
+				      "sap");
   proto_register_field_array(proto_sap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-sctp.c b/packet-sctp.c
index f7c1c06b16..2ca59ad82c 100644
--- a/packet-sctp.c
+++ b/packet-sctp.c
@@ -2,7 +2,7 @@
  * Routines for Stream Control Transmission Protocol dissection
  * Copyright 2000, Michael Tüxen <Michael.Tuexen@icn.siemens.de>
  *
- * $Id: packet-sctp.c,v 1.7 2000/11/19 08:54:05 guy Exp $
+ * $Id: packet-sctp.c,v 1.8 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -1806,7 +1806,7 @@ proto_register_sctp(void)
   
   /* Register the protocol name and description */
   proto_sctp = proto_register_protocol("Stream Control Transmission Protcol",
-				       "sctp");
+				       "SCTP", "sctp");
   
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_sctp, hf, array_length(hf));
diff --git a/packet-sdp.c b/packet-sdp.c
index 12b613eab6..13bd45aeb2 100644
--- a/packet-sdp.c
+++ b/packet-sdp.c
@@ -4,7 +4,7 @@
  * Jason Lango <jal@netapp.com>
  * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-sdp.c,v 1.17 2000/11/19 21:01:06 guy Exp $
+ * $Id: packet-sdp.c,v 1.18 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -216,7 +216,8 @@ proto_register_sdp(void)
 		&ett_sdp,
 	};
 
-        proto_sdp = proto_register_protocol("Session Description Protocol", "sdp");
+        proto_sdp = proto_register_protocol("Session Description Protocol",
+	    "SDP", "sdp");
  /*       proto_register_field_array(proto_sdp, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-sip.c b/packet-sip.c
index c83d3eed7e..b3a5d5f254 100644
--- a/packet-sip.c
+++ b/packet-sip.c
@@ -7,7 +7,7 @@
  *
  * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-sip.c,v 1.8 2000/11/19 08:54:06 guy Exp $
+ * $Id: packet-sip.c,v 1.9 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -185,7 +185,8 @@ void proto_register_sip(void)
         };
 
         /* Register the protocol name and description */
-        proto_sip = proto_register_protocol("Session Initiation Protocol", "sip");
+        proto_sip = proto_register_protocol("Session Initiation Protocol",
+	    "SIP", "sip");
 
         /* Required function calls to register the header fields and subtrees used */
         proto_register_field_array(proto_sip, hf, array_length(hf));
diff --git a/packet-sll.c b/packet-sll.c
index dd5425046a..3cdf97b0c5 100644
--- a/packet-sll.c
+++ b/packet-sll.c
@@ -1,7 +1,7 @@
 /* packet-sll.c
  * Routines for disassembly of packets from Linux "cooked mode" captures
  *
- * $Id: packet-sll.c,v 1.1 2000/12/23 08:06:14 guy Exp $
+ * $Id: packet-sll.c,v 1.2 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -304,7 +304,8 @@ proto_register_sll(void)
 		&ett_sll,
 	};
 
-	proto_sll = proto_register_protocol("Linux cooked-mode capture", "sll" );
+	proto_sll = proto_register_protocol("Linux cooked-mode capture",
+	    "SLL", "sll" );
 	proto_register_field_array(proto_sll, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-smb-browse.c b/packet-smb-browse.c
index f0b09cec0c..06d9ff50ad 100644
--- a/packet-smb-browse.c
+++ b/packet-smb-browse.c
@@ -2,7 +2,7 @@
  * Routines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb-browse.c,v 1.6 2000/11/19 08:54:06 guy Exp $
+ * $Id: packet-smb-browse.c,v 1.7 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -579,7 +579,8 @@ register_proto_smb_browse( void){
 		&ett_browse_election_desire
 	};
 
-    	proto_smb_browse = proto_register_protocol("Microsoft Windows Browser Protocol", "browser");           
+    	proto_smb_browse = proto_register_protocol("Microsoft Windows Browser Protocol",
+	    "BROWSER", "browser");
 
 	proto_register_subtree_array(ett, array_length(ett));          
 }
diff --git a/packet-smb-logon.c b/packet-smb-logon.c
index 47bcb20936..681977537f 100644
--- a/packet-smb-logon.c
+++ b/packet-smb-logon.c
@@ -2,7 +2,7 @@
  * Routines for smb net logon packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-smb-logon.c,v 1.10 2000/11/19 08:54:06 guy Exp $
+ * $Id: packet-smb-logon.c,v 1.11 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -569,7 +569,7 @@ register_proto_smb_logon( void){
 	};
 
    	proto_smb_logon = proto_register_protocol(
-   		"Microsoft Windows Logon Protocol", "netlogon");
+   		"Microsoft Windows Logon Protocol", "NETLOGON", "netlogon");
 
 	proto_register_subtree_array(ett, array_length(ett));          
 }
diff --git a/packet-smb-mailslot.c b/packet-smb-mailslot.c
index d357640899..46396cb496 100644
--- a/packet-smb-mailslot.c
+++ b/packet-smb-mailslot.c
@@ -2,7 +2,7 @@
  * Routines for smb mailslot packet dissection
  * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
  *
- * $Id: packet-smb-mailslot.c,v 1.8 2000/11/22 21:19:37 sharpe Exp $
+ * $Id: packet-smb-mailslot.c,v 1.9 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -182,7 +182,7 @@ register_proto_smb_mailslot( void){
 	};
 
    	proto_smb_msp = proto_register_protocol(
-   		"SMB MailSlot Protocol", "mailslot");
+   		"SMB MailSlot Protocol", "SMB Mailslot", "mailslot");
 
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-smb-pipe.c b/packet-smb-pipe.c
index 4215fda469..733555583c 100644
--- a/packet-smb-pipe.c
+++ b/packet-smb-pipe.c
@@ -2,7 +2,7 @@
  * Routines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb-pipe.c,v 1.14 2001/01/03 04:37:07 sharpe Exp $
+ * $Id: packet-smb-pipe.c,v 1.15 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1260,7 +1260,7 @@ register_proto_smb_pipe( void){
 
 
     	proto_smb_lanman = proto_register_protocol(
-    		"Microsoft Windows Lanman Protocol", "lanman");
+    		"Microsoft Windows Lanman Protocol", "LANMAN", "lanman");
 
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-smb.c b/packet-smb.c
index 0f43553ac6..e6a4ec43bc 100644
--- a/packet-smb.c
+++ b/packet-smb.c
@@ -2,7 +2,7 @@
  * Routines for smb packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-smb.c,v 1.76 2000/12/17 03:48:44 sharpe Exp $
+ * $Id: packet-smb.c,v 1.77 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -10896,7 +10896,8 @@ proto_register_smb(void)
 		&ett_smb_lock_type,
 	};
 
-        proto_smb = proto_register_protocol("SMB (Server Message Block Protocol)", "smb");
+        proto_smb = proto_register_protocol("SMB (Server Message Block Protocol)",
+	    "SMB", "smb");
 
 	proto_register_subtree_array(ett, array_length(ett));
 	proto_register_field_array(proto_smb, hf, array_length(hf));
diff --git a/packet-smtp.c b/packet-smtp.c
index dc4384cfe9..e55e1dde49 100644
--- a/packet-smtp.c
+++ b/packet-smtp.c
@@ -1,7 +1,7 @@
 /* packet-smtp.c
  * Routines for SMTP packet disassembly
  *
- * $Id: packet-smtp.c,v 1.12 2000/11/19 08:54:07 guy Exp $
+ * $Id: packet-smtp.c,v 1.13 2001/01/03 06:55:32 guy Exp $
  *
  * Copyright (c) 2000 by Richard Sharpe <rsharpe@ns.aus.com>
  *
@@ -563,7 +563,8 @@ proto_register_smtp(void)
 
   /* No Configuration options to register? */
 
-  proto_smtp = proto_register_protocol("Simple Mail Transfer Protocol", "smtp");
+  proto_smtp = proto_register_protocol("Simple Mail Transfer Protocol",
+				       "SMTP", "smtp");
 
   proto_register_field_array(proto_smtp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-sna.c b/packet-sna.c
index 121762664e..8d0910b7fb 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.19 2000/11/19 08:54:07 guy Exp $
+ * $Id: packet-sna.c,v 1.20 2001/01/03 06:55:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1200,7 +1200,8 @@ proto_register_sna(void)
 		&ett_sna_rh_2,
 	};
 
-        proto_sna = proto_register_protocol("Systems Network Architecture", "sna");
+        proto_sna = proto_register_protocol("Systems Network Architecture",
+	    "SNA", "sna");
 	proto_register_field_array(proto_sna, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-snmp.c b/packet-snmp.c
index 0edbc8579f..5e6c9d5aa4 100644
--- a/packet-snmp.c
+++ b/packet-snmp.c
@@ -2,7 +2,7 @@
  * Routines for SNMP (simple network management protocol)
  * D.Jorand (c) 1998
  *
- * $Id: packet-snmp.c,v 1.54 2000/12/24 09:10:12 guy Exp $
+ * $Id: packet-snmp.c,v 1.55 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -2078,8 +2078,10 @@ proto_register_snmp(void)
 #endif /* linux */
 #endif /* HAVE_UCD_SNMP_SNMP_H */
 #endif /* defined(HAVE_UCD_SNMP_SNMP_H) || defined(HAVE_SNMP_SNMP_H) */
-        proto_snmp = proto_register_protocol("Simple Network Management Protocol", "snmp");
-        proto_smux = proto_register_protocol("SNMP Multiplex Protocol", "smux");
+        proto_snmp = proto_register_protocol("Simple Network Management Protocol",
+	    "SNMP", "snmp");
+        proto_smux = proto_register_protocol("SNMP Multiplex Protocol",
+	    "SMUX", "smux");
         proto_register_field_array(proto_snmp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-socks.c b/packet-socks.c
index 1d7b489fe7..cb8701381f 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.15 2000/11/19 08:54:08 guy Exp $
+ * $Id: packet-socks.c,v 1.16 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1137,7 +1137,7 @@ proto_register_socks( void){
 
 
    	proto_socks = proto_register_protocol (
-   		"Socks Protocol", "socks");           
+   		"Socks Protocol", "Socks", "socks");           
 
 	proto_register_field_array(proto_socks, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));  
diff --git a/packet-srvloc.c b/packet-srvloc.c
index 2c94a0f1af..fcfdd4b974 100644
--- a/packet-srvloc.c
+++ b/packet-srvloc.c
@@ -6,7 +6,7 @@
  *       In particular I have not had an opportunity to see how it 
  *       responds to SRVLOC over TCP.
  *
- * $Id: packet-srvloc.c,v 1.16 2000/11/19 08:54:08 guy Exp $
+ * $Id: packet-srvloc.c,v 1.17 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -523,7 +523,8 @@ proto_register_srvloc(void)
       &ett_srvloc_flags,
    };
 
-    proto_srvloc = proto_register_protocol("Service Location Protocol", "srvloc");
+    proto_srvloc = proto_register_protocol("Service Location Protocol",
+					   "SRVLOC", "srvloc");
     proto_register_field_array(proto_srvloc, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 };
diff --git a/packet-sscop.c b/packet-sscop.c
index 3be2922ac4..01a7c1b9cd 100644
--- a/packet-sscop.c
+++ b/packet-sscop.c
@@ -2,7 +2,7 @@
  * Routines for SSCOP (Q.2110, Q.SAAL) frame disassembly
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-sscop.c,v 1.12 2000/11/19 08:54:09 guy Exp $
+ * $Id: packet-sscop.c,v 1.13 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -322,6 +322,6 @@ proto_register_sscop(void)
 	static gint *ett[] = {
 		&ett_sscop,
 	};
-	proto_sscop = proto_register_protocol("SSCOP", "sscop");
+	proto_sscop = proto_register_protocol("SSCOP", "SSCOP", "sscop");
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-stat.c b/packet-stat.c
index 856a8f46b6..58f66eb8d1 100644
--- a/packet-stat.c
+++ b/packet-stat.c
@@ -1,7 +1,7 @@
 /* packet-stat.c
  * Routines for stat dissection
  *
- * $Id: packet-stat.c,v 1.5 2000/04/04 06:46:28 guy Exp $
+ * $Id: packet-stat.c,v 1.6 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -76,7 +76,7 @@ proto_register_stat(void)
 		&ett_stat,
 	};
 
-	proto_stat = proto_register_protocol("Status Service", "stat");
+	proto_stat = proto_register_protocol("Status Service", "STAT", "stat");
 #if 0
 	proto_register_field_array(proto_stat, hf, array_length(hf));
 #endif
diff --git a/packet-syslog.c b/packet-syslog.c
index 722997589c..16dd16a4f6 100644
--- a/packet-syslog.c
+++ b/packet-syslog.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000, Gerald Combs <gerald@zing.org>
  *
- * $Id: packet-syslog.c,v 1.7 2000/11/19 08:54:09 guy Exp $
+ * $Id: packet-syslog.c,v 1.8 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -239,7 +239,7 @@ void proto_register_syslog(void)
   };
 
   /* Register the protocol name and description */
-  proto_syslog = proto_register_protocol("Syslog message", "syslog");
+  proto_syslog = proto_register_protocol("Syslog message", "Syslog", "syslog");
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_field_array(proto_syslog, hf, array_length(hf));
diff --git a/packet-tacacs.c b/packet-tacacs.c
index d2df1b034c..fa7c4a461f 100644
--- a/packet-tacacs.c
+++ b/packet-tacacs.c
@@ -1,7 +1,7 @@
 /* packet-tacacs.c
  * Routines for cisco tacacs/tacplus/AAA packet dissection
  *
- * $Id: packet-tacacs.c,v 1.8 2000/11/19 08:54:09 guy Exp $
+ * $Id: packet-tacacs.c,v 1.9 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -151,7 +151,7 @@ proto_register_tacacs(void)
 	static gint *ett[] = {
 		&ett_tacacs,
 	};
-	proto_tacacs = proto_register_protocol("TACACS", "tacacs");
+	proto_tacacs = proto_register_protocol("TACACS", "TACACS", "tacacs");
 	proto_register_field_array(proto_tacacs, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-tcp.c b/packet-tcp.c
index da59bba3e7..9e50ec65af 100644
--- a/packet-tcp.c
+++ b/packet-tcp.c
@@ -1,7 +1,7 @@
 /* packet-tcp.c
  * Routines for TCP packet disassembly
  *
- * $Id: packet-tcp.c,v 1.93 2000/12/30 05:23:56 itojun Exp $
+ * $Id: packet-tcp.c,v 1.94 2001/01/03 06:55:33 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -745,7 +745,8 @@ proto_register_tcp(void)
 	};
 	module_t *tcp_module;
 
-	proto_tcp = proto_register_protocol ("Transmission Control Protocol", "tcp");
+	proto_tcp = proto_register_protocol("Transmission Control Protocol",
+	    "TCP", "tcp");
 	proto_register_field_array(proto_tcp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-telnet.c b/packet-telnet.c
index fd08a28ae8..cfcd02716f 100644
--- a/packet-telnet.c
+++ b/packet-telnet.c
@@ -2,7 +2,7 @@
  * Routines for telnet packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-telnet.c,v 1.21 2000/11/19 08:54:09 guy Exp $
+ * $Id: packet-telnet.c,v 1.22 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -428,7 +428,7 @@ proto_register_telnet(void)
 		&ett_telnet_subopt,
 	};
 
-        proto_telnet = proto_register_protocol("Telnet", "telnet");
+        proto_telnet = proto_register_protocol("Telnet", "TELNET", "telnet");
  /*       proto_register_field_array(proto_telnet, hf, array_length(hf));*/
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-tftp.c b/packet-tftp.c
index 8926974bc2..adf0b22f04 100644
--- a/packet-tftp.c
+++ b/packet-tftp.c
@@ -5,7 +5,7 @@
  * Craig Newell <CraigN@cheque.uq.edu.au>
  *	RFC2347 TFTP Option Extension
  *
- * $Id: packet-tftp.c,v 1.21 2000/12/25 23:48:14 guy Exp $
+ * $Id: packet-tftp.c,v 1.22 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -270,7 +270,8 @@ proto_register_tftp(void)
     &ett_tftp,
   };
 
-  proto_tftp = proto_register_protocol("Trivial File Transfer Protocol", "tftp");
+  proto_tftp = proto_register_protocol("Trivial File Transfer Protocol",
+				       "TFTP", "tftp");
   proto_register_field_array(proto_tftp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-time.c b/packet-time.c
index 0321db2ae5..fbebe833a7 100644
--- a/packet-time.c
+++ b/packet-time.c
@@ -5,7 +5,7 @@
  * Craig Newell <CraigN@cheque.uq.edu.au>
  *	RFC2347 TIME Option Extension
  *
- * $Id: packet-time.c,v 1.9 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-time.c,v 1.10 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -86,7 +86,7 @@ proto_register_time(void)
     &ett_time,
   };
 
-  proto_time = proto_register_protocol("Time Protocol", "time");
+  proto_time = proto_register_protocol("Time Protocol", "TIME", "time");
   proto_register_field_array(proto_time, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-tns.c b/packet-tns.c
index c79442c719..4e7159b9f9 100644
--- a/packet-tns.c
+++ b/packet-tns.c
@@ -1,7 +1,7 @@
 /* packet-tns.c
  * Routines for MSX tns packet dissection
  *
- * $Id: packet-tns.c,v 1.10 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-tns.c,v 1.11 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -343,7 +343,7 @@ void proto_register_tns(void)
 		&ett_sql
 	};
 	proto_tns = proto_register_protocol(
-		"Transparent Network Substrate Protocol", "tns");
+		"Transparent Network Substrate Protocol", "TNS", "tns");
 	proto_register_field_array(proto_tns, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-tpkt.c b/packet-tpkt.c
index 6de5742021..a1e11103dd 100644
--- a/packet-tpkt.c
+++ b/packet-tpkt.c
@@ -181,7 +181,7 @@ proto_register_tpkt(void)
 	};
 
 
-	proto_tpkt = proto_register_protocol("TPKT", "tpkt");
+	proto_tpkt = proto_register_protocol("TPKT", "TPKT", "tpkt");
 	proto_register_field_array(proto_tpkt, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-tr.c b/packet-tr.c
index 3e383303dd..64ae7ed87c 100644
--- a/packet-tr.c
+++ b/packet-tr.c
@@ -2,7 +2,7 @@
  * Routines for Token-Ring packet disassembly
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-tr.c,v 1.52 2000/11/29 05:16:15 gram Exp $
+ * $Id: packet-tr.c,v 1.53 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -666,7 +666,7 @@ proto_register_tr(void)
 		&ett_token_ring_fc,
 	};
 
-	proto_tr = proto_register_protocol("Token-Ring", "tr");
+	proto_tr = proto_register_protocol("Token-Ring", "Token-Ring", "tr");
 	proto_register_field_array(proto_tr, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-trmac.c b/packet-trmac.c
index b6f2f4f91f..9cd4fc32d9 100644
--- a/packet-trmac.c
+++ b/packet-trmac.c
@@ -2,7 +2,7 @@
  * Routines for Token-Ring Media Access Control
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-trmac.c,v 1.26 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-trmac.c,v 1.27 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -402,7 +402,8 @@ proto_register_trmac(void)
 		&ett_tr_nerr_cnt,
 	};
 
-        proto_trmac = proto_register_protocol("Token-Ring Media Access Control", "trmac");
+        proto_trmac = proto_register_protocol("Token-Ring Media Access Control",
+	    "TR MAC", "trmac");
 	proto_register_field_array(proto_trmac, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-udp.c b/packet-udp.c
index e313da4712..b595ebebaf 100644
--- a/packet-udp.c
+++ b/packet-udp.c
@@ -1,7 +1,7 @@
 /* packet-udp.c
  * Routines for UDP packet disassembly
  *
- * $Id: packet-udp.c,v 1.80 2000/12/13 02:24:21 guy Exp $
+ * $Id: packet-udp.c,v 1.81 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -276,7 +276,8 @@ proto_register_udp(void)
 		&ett_udp,
 	};
 
-	proto_udp = proto_register_protocol("User Datagram Protocol", "udp");
+	proto_udp = proto_register_protocol("User Datagram Protocol",
+	    "UDP", "udp");
 	proto_register_field_array(proto_udp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-v120.c b/packet-v120.c
index c0a1223aa1..6d48003d23 100644
--- a/packet-v120.c
+++ b/packet-v120.c
@@ -2,7 +2,7 @@
  * Routines for v120 frame disassembly
  * Bert Driehuis <driehuis@playbeing.org>
  *
- * $Id: packet-v120.c,v 1.15 2000/11/29 05:16:15 gram Exp $
+ * $Id: packet-v120.c,v 1.16 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -226,7 +226,8 @@ proto_register_v120(void)
         &ett_v120_header,
     };
 
-    proto_v120 = proto_register_protocol ("Async data over ISDN (V.120)", "v120");
+    proto_v120 = proto_register_protocol("Async data over ISDN (V.120)",
+					 "V.120", "v120");
     proto_register_field_array (proto_v120, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-vines.c b/packet-vines.c
index 2788fd4fa4..72325cdb53 100644
--- a/packet-vines.c
+++ b/packet-vines.c
@@ -1,7 +1,7 @@
 /* packet-vines.c
  * Routines for Banyan VINES protocol packet disassembly
  *
- * $Id: packet-vines.c,v 1.20 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-vines.c,v 1.21 2001/01/03 06:55:34 guy Exp $
  *
  * Don Lafontaine <lafont02@cn.ca>
  *
@@ -397,7 +397,7 @@ proto_register_vines(void)
 	      "Vines protocol" }}
 	};
 
-	proto_vines = proto_register_protocol("Banyan Vines", "vines");
+	proto_vines = proto_register_protocol("Banyan Vines", "Vines", "vines");
 	proto_register_field_array(proto_vines, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-vlan.c b/packet-vlan.c
index 60e76f037d..b94e71fcda 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.25 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-vlan.c,v 1.26 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -225,7 +225,7 @@ proto_register_vlan(void)
 	&ett_vlan,
   };
 
-  proto_vlan = proto_register_protocol("802.1q Virtual LAN", "vlan");
+  proto_vlan = proto_register_protocol("802.1q Virtual LAN", "VLAN", "vlan");
   proto_register_field_array(proto_vlan, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-vrrp.c b/packet-vrrp.c
index f534139c6f..3586ad1e9f 100644
--- a/packet-vrrp.c
+++ b/packet-vrrp.c
@@ -4,7 +4,7 @@
  *
  * Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-vrrp.c,v 1.9 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-vrrp.c,v 1.10 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -209,7 +209,8 @@ void proto_register_vrrp(void)
                 &ett_vrrp_ver_type
         };
 
-        proto_vrrp = proto_register_protocol("Virtual Router Redundancy Protocol", "vrrp");
+        proto_vrrp = proto_register_protocol("Virtual Router Redundancy Protocol",
+	    "VRRP", "vrrp");
         proto_register_field_array(proto_vrrp, hf, array_length(hf));
         proto_register_subtree_array(ett, array_length(ett));
 
diff --git a/packet-vtp.c b/packet-vtp.c
index 07c5128597..1903f3ada8 100644
--- a/packet-vtp.c
+++ b/packet-vtp.c
@@ -1,7 +1,7 @@
 /* packet-vtp.c
  * Routines for the disassembly of Cisco's Virtual Trunking Protocol
  *
- * $Id: packet-vtp.c,v 1.8 2000/12/28 09:49:09 guy Exp $
+ * $Id: packet-vtp.c,v 1.9 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -693,7 +693,8 @@ proto_register_vtp(void)
 		&ett_vtp_tlv,
 	};
 
-        proto_vtp = proto_register_protocol("Virtual Trunking Protocol", "vtp");
+        proto_vtp = proto_register_protocol("Virtual Trunking Protocol",
+	    "VTP", "vtp");
         proto_register_field_array(proto_vtp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-wccp.c b/packet-wccp.c
index 22cf1279d8..629fda25c2 100644
--- a/packet-wccp.c
+++ b/packet-wccp.c
@@ -2,7 +2,7 @@
  * Routines for Web Cache Coordination Protocol dissection
  * Jerry Talkington <jerryt@netapp.com>
  *
- * $Id: packet-wccp.c,v 1.14 2000/11/29 07:42:35 guy Exp $
+ * $Id: packet-wccp.c,v 1.15 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1228,7 +1228,7 @@ proto_register_wccp(void)
 	};
 
 	proto_wccp = proto_register_protocol("Web Cache Coordination Protocol",
-	    "wccp");
+	    "WCCP", "wccp");
 	proto_register_field_array(proto_wccp, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-who.c b/packet-who.c
index b45a0001df..2e9e5c56f0 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.11 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-who.c,v 1.12 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -294,7 +294,7 @@ proto_register_who(void)
 		&ett_whoent,
 	};
 
-        proto_who = proto_register_protocol("Who", "who");
+        proto_who = proto_register_protocol("Who", "WHO", "who");
 	proto_register_field_array(proto_who, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-wsp.c b/packet-wsp.c
index d00a837a82..c64342f727 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -3,7 +3,7 @@
  *
  * Routines to dissect WSP component of WAP traffic.
  * 
- * $Id: packet-wsp.c,v 1.5 2000/12/02 08:41:08 guy Exp $
+ * $Id: packet-wsp.c,v 1.6 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -1459,6 +1459,7 @@ proto_register_wsp(void)
 /* Register the protocol name and description */
 	proto_wsp = proto_register_protocol(
 		"Wireless Session Protocol",   	/* protocol name for use by ethereal */ 
+		"WSP",                          /* short version of name */
 		"wap-wsp"                    	/* Abbreviated protocol name, should Match IANA 
 						    < URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ >
 						  */
diff --git a/packet-wtp.c b/packet-wtp.c
index 442f330a58..46e90be057 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.5 2000/12/02 08:41:08 guy Exp $
+ * $Id: packet-wtp.c,v 1.6 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -603,6 +603,7 @@ proto_register_wtp(void)
 /* Register the protocol name and description */
 	proto_wtp = proto_register_protocol(
 		"Wireless Transaction Protocol",   /* protocol name for use by ethereal */ 
+		"WTP",                             /* short version of name */
 		"wap-wsp-wtp"                    /* Abbreviated protocol name, should Match IANA 
 						    < URL:http://www.isi.edu/in-notes/iana/assignments/port-numbers/ >
 						  */
diff --git a/packet-x11.c b/packet-x11.c
index e1082f7a29..e00aefbe06 100644
--- a/packet-x11.c
+++ b/packet-x11.c
@@ -2,7 +2,7 @@
  * Routines for X11 dissection
  * Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
  *
- * $Id: packet-x11.c,v 1.13 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-x11.c,v 1.14 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -2932,7 +2932,7 @@ void proto_register_x11(void)
       };
 
 /* Register the protocol name and description */
-      proto_x11 = proto_register_protocol("X11", "x11");
+      proto_x11 = proto_register_protocol("X11", "X11", "x11");
 
 /* Required function calls to register the header fields and subtrees used */
       proto_register_field_array(proto_x11, hf, array_length(hf));
diff --git a/packet-x25.c b/packet-x25.c
index 49cea19575..ef908f6f35 100644
--- a/packet-x25.c
+++ b/packet-x25.c
@@ -2,7 +2,7 @@
  * Routines for x25 packet disassembly
  * Olivier Abad <oabad@cybercable.fr>
  *
- * $Id: packet-x25.c,v 1.41 2000/12/29 01:27:35 sharpe Exp $
+ * $Id: packet-x25.c,v 1.42 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -2018,8 +2018,9 @@ proto_register_x25(void)
 	&ett_x25_fac_priority
     };
 
-    proto_x25 = proto_register_protocol ("X.25", "x.25");
-    proto_ex25 = proto_register_protocol ("Extended X.25 (modulo 128)", "ex.25");
+    proto_x25 = proto_register_protocol ("X.25", "X.25", "x.25");
+    proto_ex25 = proto_register_protocol ("Extended X.25 (modulo 128)",
+        "Extended X.25", "ex.25");
     proto_register_field_array (proto_x25, hf8, array_length(hf8));
     proto_register_field_array (proto_ex25, hf128, array_length(hf128));
     proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-xot.c b/packet-xot.c
index 4d410588a2..28d7da88bc 100644
--- a/packet-xot.c
+++ b/packet-xot.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000, Paul Ionescu	<paul@acorp.ro>
  *
- * $Id: packet-xot.c,v 1.1 2000/12/17 07:38:14 guy Exp $
+ * $Id: packet-xot.c,v 1.2 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -85,7 +85,7 @@ void proto_register_xot(void)
   };
 
   /* Register the protocol name and description */
-  proto_xot = proto_register_protocol("X.25 over TCP", "xot");
+  proto_xot = proto_register_protocol("X.25 over TCP", "XOT", "xot");
 
   /* Required function calls to register the header fields and subtrees used */
   proto_register_subtree_array(ett, array_length(ett));
diff --git a/packet-yhoo.c b/packet-yhoo.c
index 2e57d80908..877314b617 100644
--- a/packet-yhoo.c
+++ b/packet-yhoo.c
@@ -2,7 +2,7 @@
  * Routines for yahoo messenger packet dissection
  * Copyright 1999, Nathan Neulinger <nneul@umr.edu>
  *
- * $Id: packet-yhoo.c,v 1.11 2000/11/19 08:54:10 guy Exp $
+ * $Id: packet-yhoo.c,v 1.12 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -214,7 +214,8 @@ proto_register_yhoo(void)
 		&ett_yhoo,
 	};
 
-	proto_yhoo = proto_register_protocol("Yahoo Messenger Protocol", "yhoo");
+	proto_yhoo = proto_register_protocol("Yahoo Messenger Protocol",
+	    "YHOO", "yhoo");
 
 	proto_register_field_array(proto_yhoo, hf, array_length(hf));
 
diff --git a/packet-ypbind.c b/packet-ypbind.c
index a619bfa256..9ee4fb1ec7 100644
--- a/packet-ypbind.c
+++ b/packet-ypbind.c
@@ -1,7 +1,7 @@
 /* packet-ypbind.c
  * Routines for ypbind dissection
  *
- * $Id: packet-ypbind.c,v 1.5 2000/04/04 06:46:28 guy Exp $
+ * $Id: packet-ypbind.c,v 1.6 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -67,7 +67,8 @@ proto_register_ypbind(void)
 		&ett_ypbind,
 	};
 
-	proto_ypbind = proto_register_protocol("Yellow Pages Bind", "ypbind");
+	proto_ypbind = proto_register_protocol("Yellow Pages Bind",
+	    "YPBIND", "ypbind");
 	proto_register_subtree_array(ett, array_length(ett));
 }
 
diff --git a/packet-ypserv.c b/packet-ypserv.c
index e42e78c696..7401fcaef6 100644
--- a/packet-ypserv.c
+++ b/packet-ypserv.c
@@ -1,7 +1,7 @@
 /* packet-ypserv.c
  * Routines for ypserv dissection
  *
- * $Id: packet-ypserv.c,v 1.11 2000/05/31 05:07:56 guy Exp $
+ * $Id: packet-ypserv.c,v 1.12 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -240,7 +240,8 @@ proto_register_ypserv(void)
 		&ett_ypserv,
 	};
 
-	proto_ypserv = proto_register_protocol("Yellow Pages Service", "ypserv");
+	proto_ypserv = proto_register_protocol("Yellow Pages Service",
+	    "YPSERV", "ypserv");
 	proto_register_field_array(proto_ypserv, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/packet-ypxfr.c b/packet-ypxfr.c
index 28fb7c2835..5ca5a7c714 100644
--- a/packet-ypxfr.c
+++ b/packet-ypxfr.c
@@ -1,7 +1,7 @@
 /* packet-ypxfr.c
  * Routines for ypxfr dissection
  *
- * $Id: packet-ypxfr.c,v 1.4 2000/04/04 06:46:29 guy Exp $
+ * $Id: packet-ypxfr.c,v 1.5 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -57,7 +57,8 @@ proto_register_ypxfr(void)
 		&ett_ypxfr
 	};
 
-	proto_ypxfr = proto_register_protocol("Yellow Pages Transfer", "ypxfr");
+	proto_ypxfr = proto_register_protocol("Yellow Pages Transfer",
+	    "YPXFR", "ypxfr");
 	proto_register_subtree_array(ett, array_length(ett));
 }
 
diff --git a/packet-zebra.c b/packet-zebra.c
index 207a2c93da..9d887746a1 100644
--- a/packet-zebra.c
+++ b/packet-zebra.c
@@ -3,7 +3,7 @@
  *
  * Jochen Friedrich <jochen@scram.de>
  *
- * $Id: packet-zebra.c,v 1.5 2000/12/02 08:41:08 guy Exp $
+ * $Id: packet-zebra.c,v 1.6 2001/01/03 06:55:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -645,7 +645,7 @@ proto_register_zebra(void)
     &ett_message,
   };
 
-  proto_zebra = proto_register_protocol("Zebra Protocol", "zebra");
+  proto_zebra = proto_register_protocol("Zebra Protocol", "ZEBRA", "zebra");
   proto_register_field_array(proto_zebra, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index eebcc2212e..a328c7ee8f 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -1,7 +1,7 @@
 /* packet-gryphon.c
  * Routines for Gryphon protocol packet disassembly
  *
- * $Id: packet-gryphon.c,v 1.16 2000/11/29 09:49:29 guy Exp $
+ * $Id: packet-gryphon.c,v 1.17 2001/01/03 06:56:02 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Steve Limkemann <stevelim@dgtech.com>
@@ -1703,7 +1703,8 @@ plugin_init(plugin_address_table_t *pat)
     plugin_address_table_init(pat);
     if (proto_gryphon == -1) {
 	/* first activation */
-	proto_gryphon = proto_register_protocol("DG Gryphon Protocol", 
+	proto_gryphon = proto_register_protocol("DG Gryphon Protocol",
+						"Gryphon",
 						"gryphon");
 	proto_register_field_array(proto_gryphon, hf, array_length(hf));
 	proto_register_subtree_array(ett, array_length(ett));
diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c
index 09491a133e..76811fffd1 100644
--- a/plugins/mgcp/packet-mgcp.c
+++ b/plugins/mgcp/packet-mgcp.c
@@ -2,7 +2,7 @@
  * Routines for mgcp packet disassembly
  * RFC 2705
  *
- * $Id: packet-mgcp.c,v 1.11 2000/12/28 10:10:17 guy Exp $
+ * $Id: packet-mgcp.c,v 1.12 2001/01/03 06:56:03 guy Exp $
  * 
  * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu>
  *
@@ -58,7 +58,7 @@ G_MODULE_EXPORT const gchar version[] = VERSION;
 #define TCP_PORT_MGCP_CALLAGENT 2727
 #define UDP_PORT_MGCP_CALLAGENT 2727
 
-void proto_reg_handoff_mgcp(void);
+static void proto_reg_handoff_mgcp(void);
 
 
 /* Define the mgcp proto */
@@ -476,7 +476,7 @@ proto_register_mgcp(void)
                                  &global_mgcp_dissect_tree);
 
   proto_mgcp = proto_register_protocol("Media Gateway Control Protocol",
-				       "mgcp");
+				       "MGCP", "mgcp");
 
   proto_register_field_array(proto_mgcp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
@@ -484,7 +484,7 @@ proto_register_mgcp(void)
 }
 
 /* The registration hand-off routine */
-void
+static void
 proto_reg_handoff_mgcp(void)
 {
   static int mgcp_prefs_initialized = FALSE;
diff --git a/prefs.c b/prefs.c
index fcd9903313..77131d4af2 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
 /* prefs.c
  * Routines for handling preferences
  *
- * $Id: prefs.c,v 1.44 2000/11/18 21:41:36 guy Exp $
+ * $Id: prefs.c,v 1.45 2001/01/03 06:55:35 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -946,6 +946,14 @@ set_pref(gchar *pref_name, gchar *value)
       return PREFS_SET_SYNTAX_ERR;	/* no ".", so no module/name separator */
     *dotp = '\0';		/* separate module and preference name */
     module = find_module(pref_name);
+
+    /*
+     * XXX - "Diameter" rather than "diameter" was used in earlier
+     * versions of Ethereal; if we didn't find the module, and its name
+     * was "Diameter", look for "diameter" instead.
+     */
+    if (module == NULL && strcmp(pref_name, "Diameter") == 0)
+      module = find_module("diameter");
     *dotp = '.';		/* put the preference string back */
     if (module == NULL)
       return PREFS_SET_NO_SUCH_PREF;	/* no such module */