* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
#include <glib.h>
-#ifdef Q_OS_UNIX
-#include <signal.h>
-#endif
-
#include <locale.h>
#ifdef HAVE_GETOPT_H
#include "wsutil/wsgetopt.h"
#endif
-#ifndef _WIN32
-#include <wsutil/glib-compat.h>
-#endif
-
#include <wsutil/clopts_common.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/crash_info.h>
#include "ui/dissect_opts.h"
#include "ui/commandline.h"
#include "ui/capture_ui_utils.h"
+#include "ui/preference_utils.h"
#include "ui/taps.h"
#include "ui/qt/conversation_dialog.h"
//# include "airpcap_gui_utils.h"
#endif
-#include "epan/crypt/airpdcap_ws.h"
+#include "epan/crypt/dot11decrypt_ws.h"
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-#include <QTextCodec>
+/* Handle the addition of View menu items without request */
+#if defined(Q_OS_MAC)
+#include <ui/macosx/cocoa_bridge.h>
#endif
#include <ui/qt/utils/qt_ui_utils.h>
#ifdef HAVE_LIBPCAP
-/* quit a nested main window */
-void main_window_nested_quit(void)
-{
-// if (gtk_main_level() > 0)
- wsApp->quit();
-}
-
/* quit the main window */
void main_window_quit(void)
{
#endif /* HAVE_LIBPCAP */
+void exit_application(int status) {
+ if (wsApp) {
+ wsApp->quit();
+ }
+ exit(status);
+}
+
/*
* Report an error in command-line arguments.
* Creates a console on Windows.
#ifdef HAVE_LIBPCAP
int caps_queries = 0;
#endif
- /* Start time in microseconds*/
+ /* Start time in microseconds */
guint64 start_time = g_get_monotonic_time();
#ifdef DEBUG_STARTUP_TIME
- /* At least on Windows there is a problem with the loging as the preferences is taken
+ /* At least on Windows there is a problem with the logging as the preferences is taken
* into account and the preferences are loaded pretty late in the startup process.
*/
prefs.console_log_level = DEBUG_STARTUP_TIME_LOGLEVEL;
#endif /* DEBUG_STARTUP_TIME */
cmdarg_err_init(wireshark_cmdarg_err, wireshark_cmdarg_err_cont);
- // In Qt 5, C strings are treated always as UTF-8 when converted to
- // QStrings; in Qt 4, the codec must be set to make that happen
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
- // Hopefully we won't have to use QString::fromUtf8() in as many places.
- QTextCodec *utf8codec = QTextCodec::codecForName("UTF-8");
- QTextCodec::setCodecForCStrings(utf8codec);
- // XXX - QObject doesn't *have* a tr method in 5.0, as far as I can see...
- QTextCodec::setCodecForTr(utf8codec);
+#if defined(Q_OS_MAC)
+ /* Disable automatic addition of tab menu entries in view menu */
+ CocoaBridge::cleanOSGeneratedMenuItems();
#endif
/* Set the C-language locale to the native environment. */
* Attempt to get the pathname of the directory containing the
* executable file.
*/
- /* init_progfile_dir_error = */ init_progfile_dir(argv[0],
- (int (*)(int, char **)) get_gui_compiled_info);
+ /* init_progfile_dir_error = */ init_progfile_dir(argv[0]);
g_log(NULL, G_LOG_LEVEL_DEBUG, "progfile_dir: %s", get_progfile_dir());
#ifdef _WIN32
// one case on X11 and we don't yet support Android.
// We do the equivalent on macOS by setting NSHighResolutionCapable
// in Info.plist.
+ // Note that this enables Windows 8.1-style Per-monitor DPI
+ // awareness but not Windows 10-style Per-monitor v2 awareness.
// http://doc.qt.io/qt-5/scalability.html
// http://doc.qt.io/qt-5/highdpi.html
// https://bugreports.qt.io/browse/QTBUG-53022 - The device pixel ratio is pretty much bogus on Windows.
// https://bugreports.qt.io/browse/QTBUG-55510 - Windows have wrong size
#if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
- QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
/* Create The Wireshark app */
// xxx qtshark
//initialize_funnel_ops();
- AirPDcapInitContext(&airpdcap_ctx);
+ Dot11DecryptInitContext(&dot11decrypt_ctx);
QString cf_name;
unsigned int in_file_type = WTAP_TYPE_AUTO;
wsApp->setLastOpenDir(get_persdatafile_dir());
}
-#ifdef Q_OS_UNIX
- // Replicates behavior in gtk_init();
- signal(SIGPIPE, SIG_IGN);
-#endif
-
set_console_log_handler();
qInstallMessageHandler(g_log_message_handler);
#ifdef DEBUG_STARTUP_TIME
open_failure_alert_box, read_failure_alert_box,
write_failure_alert_box);
- wtap_init();
+ wtap_init(TRUE);
splash_update(RA_DISSECTORS, NULL, NULL);
#ifdef DEBUG_STARTUP_TIME
hostlist_table_set_gui_info(init_endpoint_table);
srt_table_iterate_tables(register_service_response_tables, NULL);
rtd_table_iterate_tables(register_response_time_delay_tables, NULL);
- new_stat_tap_iterate_tables(register_simple_stat_tables, NULL);
+ stat_tap_iterate_tables(register_simple_stat_tables, NULL);
if (ex_opt_count("read_format") > 0) {
in_file_type = open_info_name_to_type(ex_opt_get_next("read_format"));
splash_update(RA_EXTCAP, NULL, NULL);
extcap_register_preferences();
splash_update(RA_PREFERENCES, NULL, NULL);
+#ifdef DEBUG_STARTUP_TIME
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Calling module preferences, elapsed time %" G_GUINT64_FORMAT " us \n", g_get_monotonic_time() - start_time);
+#endif
global_commandline_info.prefs_p = ws_app.readConfigurationFiles(false);
if (global_commandline_info.dfilter != NULL)
dfilter = QString(global_commandline_info.dfilter);
- /* Removed thread code:
- * https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9e277ae6154fd04bf6a0a34ec5655a73e5a736a3
- */
-
timestamp_set_type(recent.gui_time_format);
timestamp_set_precision(recent.gui_time_precision);
timestamp_set_seconds_type (recent.gui_seconds_format);
capture_opts_trim_ring_num_files(&global_capture_opts);
#endif /* HAVE_LIBPCAP */
-
/* Notify all registered modules that have had any of their preferences
changed either from one of the preferences file or from the command
line that their preferences have changed. */
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Calling prefs_apply_all, elapsed time %" G_GUINT64_FORMAT " us \n", g_get_monotonic_time() - start_time);
#endif
prefs_apply_all();
+ prefs_to_capture_opts();
wsApp->emitAppSignal(WiresharkApplication::PreferencesChanged);
#ifdef HAVE_LIBPCAP
/* For update of WindowTitle (When use gui.window_title preference) */
main_w->setWSWindowTitle();
-////////
-
- packet_list_enable_color(recent.packet_list_colorize);
-
- g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: fetch recent color settings");
- packet_list_enable_color(TRUE);
-////////
-
-
-////////
if (!color_filters_init(&err_msg, color_filter_add_cb)) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", err_msg);
g_free(err_msg);
}
-////////
-
-#ifdef HAVE_LIBPCAP
- /* if the user didn't supply a capture filter, use the one to filter out remote connections like SSH */
- if (!global_commandline_info.start_capture && !global_capture_opts.default_options.cfilter) {
- global_capture_opts.default_options.cfilter = g_strdup(get_conn_cfilter());
- }
-#else /* HAVE_LIBPCAP */
- ////////
-#endif /* HAVE_LIBPCAP */
-
wsApp->allSystemsGo();
- g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Wireshark is up and ready to go, elapsed time %" G_GUINT64_FORMAT "us \n", g_get_monotonic_time() - start_time);
+ g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "Wireshark is up and ready to go, elapsed time %.3fs\n", (float) (g_get_monotonic_time() - start_time) / 1000000);
SimpleDialog::displayQueuedMessages(main_w);
/* User could specify filename, or display filter, or both */
g_free(s);
}
/* "-k" was specified; start a capture. */
-// show_main_window(FALSE);
check_and_warn_user_startup(cf_name);
/* If no user interfaces were specified on the command line,
start_requested_stats();
}
}
- /* if the user didn't supply a capture filter, use the one to filter out remote connections like SSH */
+ /* if the user didn't supply a capture filter, use the one to filter out remote connections like SSH */
if (!global_commandline_info.start_capture && !global_capture_opts.default_options.cfilter) {
global_capture_opts.default_options.cfilter = g_strdup(get_conn_cfilter());
}
profile_store_persconffiles(FALSE);
ret_val = wsApp->exec();
+ wsApp = NULL;
delete main_w;
recent_cleanup();
extcap_cleanup();
- AirPDcapDestroyContext(&airpdcap_ctx);
+ Dot11DecryptDestroyContext(&dot11decrypt_ctx);
#ifdef _WIN32
/* Shutdown windows sockets */
codecs_cleanup();
wtap_cleanup();
free_progdirs();
- return ret_val;
+ exit_application(ret_val);
}
/*
git.samba.org / metze / wireshark / wip.git / blobdiff