osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Leave it up to dumpcap to determine whether WinPcap was loaded and, if 

it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

svn path=/trunk/; revision=40337
This commit is contained in:
Guy Harris 2011-12-29 23:33:29 +00:00
parent 53eb852fa7
commit 32c1ee2010
2 changed files with 0 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/capture_dlg.c
View File

@ -67,9 +67,6 @@
#include "gtk/main_welcome.h"
#include "gtk/network_icons.h"
#ifdef _WIN32
#include "../capture-wpcap.h"
#endif
#include "gtk/keys.h"
@ -2743,17 +2740,6 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
return;
}
#ifdef _WIN32
/* Is WPcap loaded? */
if (!has_wpcap) {
char *detailed_err;
detailed_err = cant_load_winpcap_err("Wireshark");
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", detailed_err);
g_free(detailed_err);
return;
}
#endif
num_selected = 0;
/* use user-defined title if preference is set */
@ -3383,17 +3369,6 @@ capture_start_cb(GtkWidget *w _U_, gpointer d _U_)
airpcap_set_toolbar_start_capture(airpcap_if_active);
#endif
#ifdef _WIN32
/* Is WPcap loaded? */
if (!has_wpcap) {
char * err_msg = cant_load_winpcap_err("Wireshark");
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, err_msg);
g_free(err_msg);
return;
}
#endif
if (cap_open_w) {
/*
* There's an options dialog; get the values from it and close it.

12
gtk/capture_if_dlg.c
View File

@ -48,7 +48,6 @@
#include <wiretap/wtap.h>
#ifdef _WIN32
#include "../capture-wpcap.h"
#include "gtk/capture_if_details_dlg_win32.h"
#endif
@ -743,17 +742,6 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
return;
}
#ifdef _WIN32
/* Is WPcap loaded? */
if (!has_wpcap) {
char *detailed_err;
detailed_err = cant_load_winpcap_err("Wireshark");
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", detailed_err);
g_free(detailed_err);
return;
}
#endif
preselected = global_capture_opts.ifaces->len;
/* LOAD THE INTERFACES */
if_list = capture_interface_list(&err, &err_str);