Add a new global flag "capture_child", which is TRUE if we're a child

process for a sync mode or fork mode capture.

Have that flag control whether we do things that *only* the parent or
*only* the child should do, rather than basing it solely on the setting
of "sync_mode" or "fork_mode" (or, in the case of stuff done in the
child process either in sync mode or fork mode, rather than basing it on
the setting of those flags at all).

Split "do_capture()" into a "run_capture()" routine that starts a
capture (possibly by forking off and execing a child process, if we're
supposed to do sync mode or fork mode captures), and that assumes the
file to which the capture is to write has already been opened and that
"cf.save_file_fd" is the file descriptor for that file, and a
"do_capture()" routine that creates a temporary file, getting an FD for
it, and calls "run_capture()".

Use "run_capture()", rather than "capture()", for "-k" captures, so that
it'll do the capture in a child process if "-S" or "-F" was specified
("do_capture()" won't do because "-k" captures should write to the file
specified by the "-w" flag, not some random temporary file).

For child process captures, however, just use "capture()" - the child
process shouldn't itself fork off a child if we're in sync or fork mode,
and should just write to the file whose file descriptor was specified by
the "-W" flag on the command line.

All this allows you to do "ethereal -S -w <file> -i <interface> -k" to
start a sync mode capture from the command line.

svn path=/trunk/; revision=740

1 files changed, 9 insertions, 1 deletions

diff --git a/capture.h b/capture.h
index 2123a7c9ee..ff9e59519d 100644
--- a/capture.h
+++ b/capture.h
@@ -1,7 +1,7 @@
 /* capture.h
  * Definitions for packet capture windows
  *
- * $Id: capture.h,v 1.16 1999/09/30 06:11:44 guy Exp $
+ * $Id: capture.h,v 1.17 1999/09/30 06:49:54 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -51,7 +51,15 @@
 /* Name we give to the child process when doing a "-S" or "-F" capture. */
 #define	CHILD_NAME	"ethereal-capture"
 
+/* Create a temporary file and start a capture to it. */
 void   do_capture(void);
+
+/* Start a capture to a file we've opened; "cf.save_file" is the
+   pathname of the file, and "cf.save_file_fd" is the file descriptor
+   we got when we opened it. */
+void   run_capture(void);
+
+/* Do the low-level work of a capture. */
 void   capture(void);
 
 #endif /* HAVE_LIBPCAP */