aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter/dfilter.h
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2002-05-09 23:50:34 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2002-05-09 23:50:34 +0000
commit41cc7f0707c5c62ae5651fcd70a9e9b12a4ce387 (patch)
tree46737517f86dbb9ec37210737dd521c9c3920608 /epan/dfilter/dfilter.h
parent9625720a39eddda6ef4c34725fe8017160cf05d9 (diff)
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
Diffstat (limited to 'epan/dfilter/dfilter.h')
-rw-r--r--epan/dfilter/dfilter.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index aa6ef4321e..2956547d16 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -1,5 +1,5 @@
/*
- * $Id: dfilter.h,v 1.4 2002/01/21 07:37:37 guy Exp $
+ * $Id: dfilter.h,v 1.5 2002/05/09 23:50:30 gram Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -74,12 +74,11 @@ dfilter_apply_edt(dfilter_t *df, epan_dissect_t* edt);
/* Apply compiled dfilter */
gboolean
-dfilter_apply(dfilter_t *df, tvbuff_t *tvb, proto_tree *tree);
+dfilter_apply(dfilter_t *df, proto_tree *tree);
-/* Run a callback for each interesting field in the dfilter. */
+/* Prime a proto_tree using the fields/protocols used in a dfilter. */
void
-dfilter_foreach_interesting_field(dfilter_t *df, GFunc func,
- gpointer user_data);
+dfilter_prime_proto_tree(dfilter_t *df, proto_tree *tree);
/* Print bytecode of dfilter to stdout */
void