diff options
author | Roland Knall <rknall@gmail.com> | 2016-06-28 21:34:46 +0200 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2016-07-05 11:54:43 +0000 |
commit | f2786bc8ff5ea25fd1c36d3ebf83a29277ee662b (patch) | |
tree | 0e0f3c89505d3257ab5510c55eff956543814e40 /extcap_spawn.h | |
parent | fdd87a1e41db7039b0af5bb15f40b83db1ca3a96 (diff) | |
download | wireshark-f2786bc8ff5ea25fd1c36d3ebf83a29277ee662b.tar.gz wireshark-f2786bc8ff5ea25fd1c36d3ebf83a29277ee662b.tar.bz2 wireshark-f2786bc8ff5ea25fd1c36d3ebf83a29277ee662b.zip |
extcap: Remove g_spawn_helper support
Move g_spawn to separate file and implement functions to
use Windows based method of spawning, instead of the glib
based version
Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f
Reviewed-on: https://code.wireshark.org/review/16049
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'extcap_spawn.h')
-rw-r--r-- | extcap_spawn.h | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/extcap_spawn.h b/extcap_spawn.h new file mode 100644 index 0000000000..b9b2ef491e --- /dev/null +++ b/extcap_spawn.h @@ -0,0 +1,67 @@ +/* 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 + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#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 ( interface_options * interface, GPtrArray * args ); + +#ifdef _WIN32 +gboolean extcap_wait_for_pipe(HANDLE pipe_h, HANDLE pid); +void win32_readfrompipe(HANDLE read_pipe, gint32 max_buffer, gchar * buffer); +#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: + */ |