osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

from Richard van der Hoff: 

Attached is a patch which makes the console log level (warning/message/debug etc) a configurable preference. There's no gui for setting it, but since it's pretty much only going to be useful for developers, I'm sure you'll cope...
----
I've added a small comment to the file output that it has no dialog output

svn path=/trunk/; revision=16205
This commit is contained in:
Ulf Lamping 2005-10-12 21:26:27 +00:00
parent f57b54eeb2
commit fafdf68095
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
epan/prefs.c
View File

@ -1034,6 +1034,8 @@ init_prefs(void) {
prefs.gui_layout_content_1 = layout_pane_content_plist;
prefs.gui_layout_content_2 = layout_pane_content_pdetails;
prefs.gui_layout_content_3 = layout_pane_content_pbytes;
prefs.console_log_level =
G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR;
/* set the default values for the capture dialog box */
prefs.capture_device = NULL;
@ -1388,6 +1390,7 @@ prefs_set_pref(char *prefarg)
#define PRS_GUI_LAYOUT_CONTENT_1 "gui.layout_content_1"
#define PRS_GUI_LAYOUT_CONTENT_2 "gui.layout_content_2"
#define PRS_GUI_LAYOUT_CONTENT_3 "gui.layout_content_3"
#define PRS_CONSOLE_LOG_LEVEL "console.log.level"
/*
* This applies to more than just captures, so it's not "capture.name_resolve";
@ -1740,7 +1743,9 @@ set_pref(gchar *pref_name, gchar *value)
} else if (strcmp(pref_name, PRS_GUI_LAYOUT_CONTENT_3) == 0) {
prefs.gui_layout_content_3 =
find_index_from_string_array(value, gui_layout_content_text, 0);
} else if (strcmp(pref_name, PRS_CONSOLE_LOG_LEVEL) == 0) {
prefs.console_log_level = strtoul(value, NULL, 10);
/* handle the capture options */
} else if (strcmp(pref_name, PRS_CAP_DEVICE) == 0) {
if (prefs.capture_device != NULL)
@ -2422,6 +2427,19 @@ write_prefs(char **pf_path_return)
(prefs.st_server_bg.green * 255 / 65535),
(prefs.st_server_bg.blue * 255 / 65535));
fprintf(pf, "\n######## Console: logging level ########\n");
fprintf(pf, "# (debugging only, not in the Preferences dialog)\n");
fprintf(pf, "# A bitmask of glib log levels:\n"
"# G_LOG_LEVEL_ERROR = 4\n"
"# G_LOG_LEVEL_CRITICAL = 8\n"
"# G_LOG_LEVEL_WARNING = 16\n"
"# G_LOG_LEVEL_MESSAGE = 32\n"
"# G_LOG_LEVEL_INFO = 64\n"
"# G_LOG_LEVEL_DEBUG = 128\n");
fprintf(pf, PRS_CONSOLE_LOG_LEVEL ": %u\n",
prefs.console_log_level);
fprintf(pf, "\n####### Capture ########\n");
if (prefs.capture_device != NULL) {
@ -2554,6 +2572,7 @@ copy_prefs(e_prefs *dest, e_prefs *src)
dest->gui_geometry_save_maximized = src->gui_geometry_save_maximized;
dest->gui_webbrowser = g_strdup(src->gui_webbrowser);
dest->gui_window_title = g_strdup(src->gui_window_title);
dest->console_log_level = src->console_log_level;
/* values for the capture dialog box */
dest->capture_device = g_strdup(src->capture_device);
dest->capture_devices_descr = g_strdup(src->capture_devices_descr);

1
epan/prefs.h
View File

@ -139,6 +139,7 @@ typedef struct _e_prefs {
layout_pane_content_e gui_layout_content_1;
layout_pane_content_e gui_layout_content_2;
layout_pane_content_e gui_layout_content_3;
gint console_log_level;
guint32 name_resolve;
gint name_resolve_concurrency;
gchar *capture_device;

5
gtk/main.c
View File

@ -2736,9 +2736,8 @@ console_log_handler(const char *log_domain, GLogLevelFlags log_level,
const char *level;
/* change this, if you want to see more verbose log output */
/* XXX - make this a pref value */
if( (log_level & G_LOG_LEVEL_MASK) > G_LOG_LEVEL_WARNING) {
/* ignore log message, if log_level isn't interesting */
if( !(log_level & G_LOG_LEVEL_MASK & prefs.console_log_level)) {
return;
}