diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-01-06 21:39:26 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-01-08 05:50:15 +0000 |
| commit | e80b40adbe823be084fb49cd84336939916120bb (patch) | |
| tree | d712734b953f7df6f1f79519c7abc73029152e1d /capchild/capture_sync.c | |
| parent | 6f93baced0fba7d07425e14ea698f4607964c6ed (diff) | |
extcap: remove conditional compilation.
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9
Reviewed-on: https://code.wireshark.org/review/25186
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'capchild/capture_sync.c')
| -rw-r--r-- | capchild/capture_sync.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c index 43fc2ac173..1588a5648e 100644 --- a/capchild/capture_sync.c +++ b/capchild/capture_sync.c @@ -91,9 +91,7 @@ #include <wsutil/filesystem.h> #include <wsutil/file_util.h> #include <wsutil/report_message.h> -#ifdef HAVE_EXTCAP #include "extcap.h" -#endif #include "log.h" #ifdef _WIN32 @@ -252,14 +250,11 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf cap_session->fork_child = WS_INVALID_PID; -#ifdef HAVE_EXTCAP if (!extcap_init_interfaces(capture_opts)) { report_failure("Unable to init extcaps. (tmp fifo already exists?)"); return FALSE; } -#endif - argv = init_pipe_args(&argc); if (!argv) { /* We don't know where to find dumpcap. */ @@ -338,11 +333,9 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf interface_opts = &g_array_index(capture_opts->ifaces, interface_options, j); argv = sync_pipe_add_arg(argv, &argc, "-i"); -#ifdef HAVE_EXTCAP if (interface_opts->extcap_fifo != NULL) argv = sync_pipe_add_arg(argv, &argc, interface_opts->extcap_fifo); else -#endif argv = sync_pipe_add_arg(argv, &argc, interface_opts->name); if (interface_opts->cfilter != NULL && strlen(interface_opts->cfilter) != 0) { @@ -525,11 +518,9 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf #else si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW; si.wShowWindow = SW_HIDE; /* this hides the console window */ -#ifdef HAVE_EXTCAP if(interface_opts->extcap_pipe_h != INVALID_HANDLE_VALUE) si.hStdInput = interface_opts->extcap_pipe_h; else -#endif si.hStdInput = GetStdHandle(STD_INPUT_HANDLE); si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); @@ -1716,10 +1707,8 @@ sync_pipe_input_cb(gint source, gpointer user_data) #ifdef _WIN32 ws_close(cap_session->signal_pipe_write_fd); #endif -#ifdef HAVE_EXTCAP g_log(LOG_DOMAIN_CAPTURE, G_LOG_LEVEL_DEBUG, "sync_pipe_input_cb: cleaning extcap pipe"); extcap_if_cleanup(cap_session->capture_opts, &primary_msg); -#endif capture_input_closed(cap_session, primary_msg); g_free(primary_msg); return FALSE; |