diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-03-01 15:31:45 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-02 05:22:20 +0000 |
| commit | 1a0987904fa571dc5abce03726e4ca3e17793574 (patch) | |
| tree | 59b7bfe30517005b046bddb9fcae2315f48570fa /extcap_spawn.h | |
| parent | bf4c2fd82b30d8b088fcb1235263dce9173d4cd7 (diff) | |
Generalize our process spawning code.
Move the contents of extcap_spawn to ws_pipe. Rename various extcap_*
prefixes to ws_pipe_*. Open stdin when we spawn processes.
Change-Id: I9286295443ee955bb6328b0ed6f945ee0bb2a798
Reviewed-on: https://code.wireshark.org/review/26216
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap_spawn.h')
| -rw-r--r-- | extcap_spawn.h | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/extcap_spawn.h b/extcap_spawn.h deleted file mode 100644 index 0557a6f352..0000000000 --- a/extcap_spawn.h +++ /dev/null @@ -1,54 +0,0 @@ -/* extcap_spawn.h - * Helper routines for executing extcap utilities - * - * Copyright 2016, Roland Knall <rknall@gmail.com> - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 1998 Gerald Combs - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef __EXTCAP_SPAWN_H__ -#define __EXTCAP_SPAWN_H__ - -#include <config.h> - -#include <glib.h> - -#include <extcap.h> - -typedef struct _extcap_userdata { - GPid pid; - gchar * extcap_stderr; - gint exitcode; - gint extcap_stderr_rd; - gint extcap_stdout_rd; -#ifdef _WIN32 - HANDLE threadId; -#endif -} extcap_userdata; - -gboolean extcap_spawn_sync ( gchar * dirname, gchar * command, gint argc, gchar ** argv, gchar ** command_output ); - -GPid extcap_spawn_async ( extcap_userdata * userdata, GPtrArray * args ); - -#ifdef _WIN32 -gboolean extcap_wait_for_pipe(HANDLE * pipe_handles, int num_pipe_handles, HANDLE pid); -#endif - -#endif - -/* - * Editor modelines - http://www.wireshark.org/tools/modelines.html - * - * Local variables: - * c-basic-offset: 4 - * tab-width: 8 - * indent-tabs-mode: nil - * End: - * - * vi: set shiftwidth=4 tabstop=8 expandtab: - * :indentSize=4:tabSize=8:noTabs=true: - */ |