Merge the work in Novell_NCP_branch into the mainline code.

A little work still needs to be done on the new NCP dissector -- make
some of the COL_INFO texts more useful, handle a Unicode issue, and
modify some of the cases that use "request conditions".
But the NCP dissector as it stands is very usable now.

Note: I didn't merge in the PROTO_LENGTH_UNTIL_END macro... I wanted
to think about the various possible macros and review an email conversation
I had with Guy on the subject.

svn path=/trunk/; revision=5432

1 files changed, 3 insertions, 11 deletions

diff --git a/epan/epan.c b/epan/epan.c
index d503078dd3..5de00d7cfc 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -1,6 +1,6 @@
 /* epan.h
  *
- * $Id: epan.c,v 1.17 2002/02/18 01:08:41 guy Exp $
+ * $Id: epan.c,v 1.18 2002/05/09 23:50:28 gram Exp $
  *
  * Ethereal Protocol Analyzer Library
  *
@@ -50,6 +50,7 @@ epan_init(const char *plugin_dir, void (register_all_protocols)(void),
 	proto_init(plugin_dir,register_all_protocols,register_all_handoffs);
 	packet_init();
 	dfilter_init();
+	final_registration_all_protocols();
 }
 
 void
@@ -116,19 +117,10 @@ epan_dissect_free(epan_dissect_t* edt)
 	g_free(edt);
 }
 
-static void
-prime_dfilter(gpointer data, gpointer user_data)
-{
-    int hfid = GPOINTER_TO_INT(data);
-    proto_tree *tree = user_data;
-
-    proto_tree_prime_hfid(tree, hfid);
-}
-
 void
 epan_dissect_prime_dfilter(epan_dissect_t *edt, dfilter_t* dfcode)
 {
-    dfilter_foreach_interesting_field(dfcode, prime_dfilter, edt->tree);
+	dfilter_prime_proto_tree(dfcode, edt->tree);
 }
 
 void