print system enhanced, more print ranges and expanded states

[obnox/wireshark/wip.git] / print.h

diff --git a/print.h b/print.h
index 23c6757b2ba07f199da03ed1d98dd624c133e2b0..89603b903a964517d6d9f4131cce275cd0e8eaf0 100644 (file)
--- a/print.h
+++ b/print.h
@@ -1,25 +1,24 @@
 /* print.h
  * Definitions for printing packet analysis trees.
  *
- * $Id: print.h,v 1.20 2000/08/11 13:34:26 deniel Exp $
+ * $Id: print.h,v 1.33 2003/12/09 22:21:24 ulfl Exp $
  *
- * Gilbert Ramirez <gram@xiexie.org>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- * 
  * 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.
@@ -28,22 +27,41 @@
 #ifndef __PRINT_H__
 #define __PRINT_H__
 
-#include "packet.h"
+#include <epan/packet.h>
 
 #define PR_FMT_TEXT 0
 #define PR_FMT_PS   1
+#define PR_FMT_PDML 2
+
+/* print_range, enum which frames should be printed */
+typedef enum {
+  print_range_selected_only,    /* selected frame(s) only (currently only one) */
+  print_range_marked_only,      /* marked frames only */
+  print_range_all_displayed,    /* all frames currently displayed */
+  print_range_all_captured      /* all frames in capture */
+} print_range_e;
+
+/* print_dissections, enum how the dissections should be printed */
+typedef enum {
+  print_dissections_collapsed,    /* no dissection details */
+  print_dissections_as_displayed, /* details as displayed */
+  print_dissections_expanded      /* all dissection details */
+} print_dissections_e;
 
 typedef struct {
+  gint         format;         /* text or PostScript */
   gboolean     to_file;        /* TRUE if we're printing to a file */
   char         *dest;          /* if printing to file, pathname;
                                   if not, command string */
-  gint         format;         /* text or PostScript */
+  print_range_e print_range;
+  /*guint32            print_range_min;*/
+  /*guint32            print_range_max;*/
+
   gboolean     print_summary;  /* TRUE if we should just print summary;
                                   FALSE if we should print protocol tree. */
+  print_dissections_e   print_dissections;
   gboolean     print_hex;      /* TRUE if we should also print hex data;
                                   FALSE if we should print only if not dissected. */
-  gboolean     expand_all;     /* TRUE if we should expand all levels;
-                                  FALSE if we should expand as displayed. */
 } print_args_t;
 
 /* Functions in print.h */
@@ -52,10 +70,9 @@ FILE *open_print_dest(int to_file, const char *dest);
 void close_print_dest(int to_file, FILE *fh);
 void print_preamble(FILE *fh, gint format);
 void print_finale(FILE *fh, gint format);
-void proto_tree_print(gboolean print_one_packet, print_args_t *print_args,
-    GNode *protocol_tree, const u_char *pd, frame_data *fd, FILE *fh);
-void print_hex_data(FILE *fh, gint format, register const u_char *cp,
-    register u_int length, char_enc encoding);
-void print_line(FILE *fh, gint format, char *line);
+void proto_tree_print(print_args_t *print_args, epan_dissect_t *edt,
+    FILE *fh);
+void print_hex_data(FILE *fh, gint format, epan_dissect_t *edt);
+void print_line(FILE *fh, int indent, gint format, char *line);
 
 #endif /* print.h */