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

Avoid a packet rescan if we don't have an AirPcap adapter. 

svn path=/trunk/; revision=47945
This commit is contained in:
Anders Broman 2013-02-28 17:55:07 +00:00
parent fe16b9835f
commit 6bf8fcfad4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/gtk/capture_if_dlg.c
View File

@ -868,9 +868,6 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
#ifdef HAVE_AIRPCAP
/* LOAD AIRPCAP INTERFACES */
decryption_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
update_decryption_mode_list(decryption_cb);
/* If no airpcap interface is present, gray everything */
if (airpcap_if_active == NULL) {
if (airpcap_if_list == NULL) {
@ -878,13 +875,19 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
airpcap_enable_toolbar_widgets(wireless_tb,FALSE);
} else {
/* default adapter is not airpcap... or is airpcap but is not found*/
if (airpcap_if_active)
if (airpcap_if_active){
/* XXX can never happen? */
airpcap_set_toolbar_stop_capture(airpcap_if_active);
}
airpcap_enable_toolbar_widgets(wireless_tb,FALSE);
}
}
if (airpcap_if_active)
if (airpcap_if_active){
decryption_cb = g_object_get_data(G_OBJECT(wireless_tb),AIRPCAP_TOOLBAR_DECRYPTION_KEY);
/* XXXX update_decryption_mode_list() trigers a rescan, should only be done if the mode is changed */
update_decryption_mode_list(decryption_cb);
airpcap_set_toolbar_start_capture(airpcap_if_active);
}
#endif
cap_if_w = dlg_window_new("Wireshark: Capture Interfaces"); /* transient_for top_level */