diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-06-11 15:05:44 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-06-16 03:45:54 +0000 |
| commit | ece4b01f218ab4e71233580e199e830b83958c99 (patch) | |
| tree | f7503d8f097b6e3f6406dd3f6b0c69bb46b97909 /wireshark-qt.cpp | |
| parent | 2a3fa1418544469e7dc6f0e0fddb6eaab507b71a (diff) | |
| download | wireshark-ece4b01f218ab4e71233580e199e830b83958c99.tar.gz | |
Add the wireless toolbar.
Add the wireless toolbar to the Qt UI.
Start adding AirPcap support to ui/80211_utils. Add FCS validation
routines to ws80211_utils.
Move a bunch of AirPcap routines that require epan from caputils to
ui/gtk. They were required for driver key management, which we'll
leave to the AirPcap Control Panel in the Qt UI.
Move frequency-utils to wsutil.
Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1
Reviewed-on: https://code.wireshark.org/review/8910
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'wireshark-qt.cpp')
| -rw-r--r-- | wireshark-qt.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index f42697c3cf..aa2859bec4 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -119,10 +119,6 @@ capture_options global_capture_opts; #endif -#ifdef HAVE_AIRPCAP -int airpcap_dll_ret_val = -1; -#endif - GString *comp_info_str, *runtime_info_str; /* update the main window */ @@ -438,7 +434,7 @@ int main(int argc, char *argv[]) gboolean arg_error = FALSE; #ifdef _WIN32 - WSADATA wsaData; + WSADATA wsaData; #endif /* _WIN32 */ char *rf_path; @@ -644,6 +640,8 @@ DIAG_ON(cast-qual) #ifdef HAVE_AIRPCAP /* Load the airpcap.dll. This must also be done before collecting * run-time version information. */ + load_airpcap(); +#if 0 airpcap_dll_ret_val = load_airpcap(); switch (airpcap_dll_ret_val) { @@ -664,7 +662,6 @@ DIAG_ON(cast-qual) airpcap_if_active = airpcap_get_default_if(airpcap_if_list); } break; -#if 0 /* * XXX - Maybe we need to warn the user if one of the following happens??? */ @@ -679,8 +676,8 @@ DIAG_ON(cast-qual) case AIRPCAP_DLL_NOT_FOUND: simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s","AIRPCAP_DDL_NOT_FOUND\n"); break; -#endif } +#endif #endif /* HAVE_AIRPCAP */ #endif /* _WIN32 */ |