Put all the capture options into a structure.

Move the ringbuffer capture options from the "capture_file" structure to
the structure for capture options, as they're a property of an
in-progress capture, not a property of a particular capture file.

svn path=/trunk/; revision=4799

1 files changed, 22 insertions, 11 deletions

diff --git a/capture.h b/capture.h
index d3eb6e853c..5269b4e74a 100644
--- a/capture.h
+++ b/capture.h
@@ -1,7 +1,7 @@
 /* capture.h
  * Definitions for packet capture windows
  *
- * $Id: capture.h,v 1.30 2002/02/24 03:33:04 guy Exp $
+ * $Id: capture.h,v 1.31 2002/02/24 09:25:34 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -31,16 +31,27 @@
 /* Name we give to the child process when doing a "-S" capture. */
 #define	CHILD_NAME	"ethereal-capture"
 
-extern gboolean has_snaplen;  /* TRUE if maximum capture packet length is specified */
-extern int snaplen; /* Maximum captured packet length */
-extern int promisc_mode; /* capture in promiscuous mode */
-extern int sync_mode;	/* fork a child to do the capture, and sync between them */
-extern gboolean has_autostop_count;
-extern int autostop_count;
-extern gboolean has_autostop_filesize; /* TRUE if maximum capture file size is specified */
-extern gint32 autostop_filesize; /* Maximum capture file size */
-extern gboolean has_autostop_duration; /* TRUE if maximum capture duration is specified */
-extern gint32 autostop_duration; /* Maximum capture duration */
+typedef struct {
+	gboolean has_snaplen;		/* TRUE if maximum capture packet
+					   length is specified */
+	int snaplen;			/* Maximum captured packet length */
+	int promisc_mode;		/* Capture in promiscuous mode */
+	int sync_mode;			/* Fork a child to do the capture,
+					   and sync between them */
+	gboolean has_autostop_count;	/* TRUE if maximum packet count is
+					   specified */
+	int autostop_count;		/* Maximum packet count */
+	gboolean has_autostop_duration;	/* TRUE if maximum capture duration
+					   is specified */
+	gint32 autostop_duration;	/* Maximum capture duration */
+	gboolean has_autostop_filesize;	/* TRUE if maximum capture file size
+					   is specified */
+	gint32 autostop_filesize;	/* Maximum capture file size */
+	gboolean ringbuffer_on;		/* TRUE if ring buffer in use */
+	guint32 ringbuffer_num_files;	/* Number of ring buffer files */
+} capture_options;
+
+extern capture_options capture_opts;
 
 extern int sync_pipe[2]; /* used to sync father */
 extern int quit_after_cap; /* Makes a "capture only mode". Implies -k */