Provide for per-protocol-tree data in the proto_tree code.

Put a hash-table of "interesting" fields in the per-proto-tree data.
The dfilter code records which fields/protocols are "interesting" (by which
I mean, their value or existence is checked). Thus, the proto_tree routines
can create special arrays of field_info*'s that are ready for the dfilter
engine to use during a filter operation.

Also store the "proto_tree_is_visible" boolean, renamed "visible", in
the per-proto-tree data.

Move epan_dissect_t to its own header file to make #include dependencies
easier to handle.

Provide epan_dissect_fill_in_columns(), which accepts just the epan_dissect_t*
as an argument.

epan_dissect_new() needs to be followed by epan_dissect_run() for the
dissection to actually take place. Between those two calls,
epan_dissect_prime_dfilter() can be run 0, 1, or multiple times in order to
prime the empty proto_tree with the "intersesting" fields from the dfilter_t.

svn path=/trunk/; revision=4422

1 files changed, 30 insertions, 20 deletions

diff --git a/epan/epan.h b/epan/epan.h
index f33cb1034e..3a3197f540 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -1,21 +1,37 @@
 /* epan.h
  *
- * $Id: epan.h,v 1.11 2001/12/16 22:16:13 guy Exp $
+ * $Id: epan.h,v 1.12 2001/12/18 19:09:03 gram Exp $
  *
  * Ethereal Protocol Analyzer Library
  *
+ * Copyright (c) 2001 by Gerald Combs <gerald@ethereal.com>
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
  */
 
 #ifndef EPAN_H
 #define EPAN_H
 
 #include <glib.h>
+#include "frame_data.h"
+#include "column_info.h"
 
-struct _epan_dissect_t;
+typedef struct _epan_dissect_t epan_dissect_t;
 
-/* XXX - for now */
-#include "packet.h"
-#include "packet_info.h"
+#include "dfilter/dfilter.h"
 
 void epan_init(const char * plugindir, void (register_all_protocols)(void),
 	       void (register_all_handoffs)(void));
@@ -40,24 +56,18 @@ void
 epan_free(epan_t*);
 
 
+epan_dissect_t*
+epan_dissect_new(gboolean create_proto_tree, gboolean proto_tree_visible);
 
+void
+epan_dissect_run(epan_dissect_t *edt, void* pseudo_header,
+        const guint8* data, frame_data *fd, column_info *cinfo);
 
-/* Dissection of a single byte array. Holds tvbuff info as
- * well as proto_tree info. As long as the epan_dissect_t for a byte
- * array is in existence, you must not free or move that byte array,
- * as the structures that the epan_dissect_t contains might have pointers
- * to addresses in your byte array.
- */
-typedef struct _epan_dissect_t {
-	tvbuff_t	*tvb;
-	proto_tree	*tree;
-	packet_info	pi;
-} epan_dissect_t;
+void
+epan_dissect_prime_dfilter(epan_dissect_t *edt, dfilter_t*);
 
-epan_dissect_t*
-epan_dissect_new(void* pseudo_header, const guint8* data, frame_data *fd,
-		gboolean create_proto_tree, gboolean proto_tree_visible,
-		column_info *cinfo);
+void
+epan_dissect_fill_in_columns(epan_dissect_t *edt);
 
 void
 epan_dissect_free(epan_dissect_t* edt);