diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-02-11 23:25:11 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-02-11 23:25:11 +0000 |
| commit | cf94760fa4a1de9fdb1aa5a3152516699bceaf45 (patch) | |
| tree | 1c665d6e6c1ad304187017b4cdbe4ecc3aba2532 /capture_opts.h | |
| parent | ec37501696d809d932c6db398b71950b4beb4e36 (diff) | |
the point of no return ...
using dumpcap as the capture child for Ethereal.
dumpcap is a plain console application now, even for Win32 (so no WinMain, create_console and special piping stuff reguired). The undocumented command line option -Z will switch dumpcap into "child mode", using binary instead of plain text output messages to communicate with a parent Ethereal.
Ethereal's main.c no longer needs to distinguish between child mode or not, so some simplifying here.
capture_sync.c has to call dumpcap in a "hidden window" mode using CreateProcess instead of spawnvp, otherwise an uggly console window would appear. The handles created by _pipe doesn't seem to be inheritable for this function, using CreatePipe instead.
The file capture_loop.c is only needed by dumpcap, removed from Ethereal link objects.
Some debugging aid added and other minor cleanup done.
svn path=/trunk/; revision=17256
Diffstat (limited to 'capture_opts.h')
| -rw-r--r-- | capture_opts.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/capture_opts.h b/capture_opts.h index 178757e2c8..8c3b85eff4 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -91,7 +91,7 @@ typedef struct capture_options_tag { /* internally used (don't touch from outside) */ int fork_child; /**< If not -1, in parent, process ID of child */ #ifdef _WIN32 - int signal_pipe_fd; /**< the pipe to signal the child */ + int signal_pipe_write_fd; /**< the pipe to signal the child */ #endif capture_state state; /**< current state of the capture engine */ gboolean output_to_pipe; /**< save_file is a pipe (named or stdout) */ |