/* prefs.c
* Routines for handling preferences
*
- * $Id: prefs.c,v 1.54 2001/07/22 21:27:54 guy Exp $
+ * $Id: prefs.c,v 1.86 2002/06/16 00:58:37 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
#include <sys/types.h>
#endif
-#ifdef HAVE_DIRECT_H
-#include <direct.h>
-#endif
-
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <unistd.h>
#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
+#include <glib.h>
-#include <epan.h>
-#include <filesystem.h>
+#include <epan/filesystem.h>
#include "globals.h"
-#include "packet.h"
+#include <epan/resolv.h>
+#include <epan/packet.h>
#include "file.h"
#include "prefs.h"
-#include "proto.h"
+#include <epan/proto.h>
#include "column.h"
#include "print.h"
#include "prefs-int.h"
/* Internal functions */
+static module_t *find_module(const char *name);
+static struct preference *find_preference(module_t *, const char *);
static int set_pref(gchar*, gchar*);
static GList *get_string_list(gchar *);
+static gchar *put_string_list(GList *);
static void clear_string_list(GList *);
static void free_col_info(e_prefs *);
-#define PF_NAME "preferences"
-
-#define GPF_PATH DATAFILE_DIR "/ethereal.conf"
+#define GPF_NAME "ethereal.conf"
+#define PF_NAME "preferences"
static gboolean init_prefs = TRUE;
-static gchar *pf_path = NULL;
+static gchar *gpf_path = NULL;
/*
* XXX - variables to allow us to attempt to interpret the first
*/
static GList *modules;
+static gint
+module_compare_name(gconstpointer p1_arg, gconstpointer p2_arg)
+{
+ const module_t *p1 = p1_arg;
+ const module_t *p2 = p2_arg;
+
+ return g_strcasecmp(p1->name, p2->name);
+}
+
/*
* Register a module that will have preferences.
* Specify the name used for the module in the preferences file, the
void (*apply_cb)(void))
{
module_t *module;
+ const guchar *p;
module = g_malloc(sizeof (module_t));
module->name = name;
module->prefs = NULL; /* no preferences, to start */
module->numprefs = 0;
module->prefs_changed = FALSE;
+ module->obsolete = FALSE;
+
+ /*
+ * Make sure that only lower-case ASCII letters, numbers,
+ * underscores, and dots appear in the module name.
+ *
+ * Crash if there is, as that's an error in the code;
+ * you can make the title a nice string with capitalization,
+ * white space, punctuation, etc., but the name can be used
+ * on the command line, and shouldn't require quoting,
+ * shifting, etc.
+ */
+ for (p = name; *p != '\0'; p++)
+ g_assert(isascii(*p) &&
+ (islower(*p) || isdigit(*p) || *p == '_' || *p == '.'));
- modules = g_list_append(modules, module);
+ /*
+ * Make sure there's not already a module with that
+ * name. Crash if there is, as that's an error in the
+ * code, and the code has to be fixed not to register
+ * more than one module with the same name.
+ */
+ g_assert(find_module(name) == NULL);
+
+ modules = g_list_insert_sorted(modules, module, module_compare_name);
return module;
}
apply_cb);
}
+/*
+ * Register that a protocol used to have preferences but no longer does,
+ * by creating an "obsolete" module for it.
+ */
+module_t *
+prefs_register_protocol_obsolete(int id)
+{
+ module_t *module;
+
+ module = prefs_register_module(proto_get_protocol_filter_name(id),
+ proto_get_protocol_short_name(id),
+ NULL);
+ module->obsolete = TRUE;
+ return module;
+}
+
/*
* Find a module, given its name.
*/
}
static module_t *
-find_module(char *name)
+find_module(const char *name)
{
GList *list_entry;
- list_entry = g_list_find_custom(modules, name, module_match);
+ list_entry = g_list_find_custom(modules, (gpointer)name, module_match);
if (list_entry == NULL)
return NULL; /* no such module */
return (module_t *) list_entry->data;
module_t *module = data;
module_cb_arg_t *arg = user_data;
- (*arg->callback)(module, arg->user_data);
+ if (!module->obsolete)
+ (*arg->callback)(module, arg->user_data);
}
/*
* Call a callback function, with a specified argument, for each module.
+ * Ignores "obsolete" modules; their sole purpose is to allow old
+ * preferences for dissectors that no longer have preferences to be
+ * silently ignored in preference files.
*/
void
prefs_module_foreach(module_cb callback, gpointer user_data)
}
static void
-call_apply_cb(gpointer data, gpointer user_data)
+call_apply_cb(gpointer data, gpointer user_data _U_)
{
module_t *module = data;
+ if (module->obsolete)
+ return;
if (module->prefs_changed) {
if (module->apply_cb != NULL)
(*module->apply_cb)();
/*
* Register a preference in a module's list of preferences.
+ * If it has a title, give it an ordinal number; otherwise, it's a
+ * preference that won't show up in the UI, so it shouldn't get an
+ * ordinal number (the ordinal should be the ordinal in the set of
+ * *visible* preferences).
*/
static pref_t *
register_preference(module_t *module, const char *name, const char *title,
const char *description)
{
pref_t *preference;
+ const guchar *p;
preference = g_malloc(sizeof (pref_t));
preference->name = name;
preference->title = title;
preference->description = description;
- preference->ordinal = module->numprefs;
+ if (title != NULL)
+ preference->ordinal = module->numprefs;
+ else
+ preference->ordinal = -1; /* no ordinal for you */
+ /*
+ * Make sure that only lower-case ASCII letters, numbers,
+ * underscores, and dots appear in the preference name.
+ *
+ * Crash if there is, as that's an error in the code;
+ * you can make the title and description nice strings
+ * with capitalization, white space, punctuation, etc.,
+ * but the name can be used on the command line,
+ * and shouldn't require quoting, shifting, etc.
+ */
+ for (p = name; *p != '\0'; p++)
+ g_assert(isascii(*p) &&
+ (islower(*p) || isdigit(*p) || *p == '_' || *p == '.'));
+
+ /*
+ * Make sure there's not already a preference with that
+ * name. Crash if there is, as that's an error in the
+ * code, and the code has to be fixed not to register
+ * more than one preference with the same name.
+ */
+ g_assert(find_preference(module, name) == NULL);
+
+ /*
+ * There isn't already one with that name, so add the
+ * preference.
+ */
module->prefs = g_list_append(module->prefs, preference);
- module->numprefs++;
+ if (title != NULL)
+ module->numprefs++;
return preference;
}
}
static struct preference *
-find_preference(module_t *module, char *name)
+find_preference(module_t *module, const char *name)
{
GList *list_entry;
- list_entry = g_list_find_custom(module->prefs, name, preference_match);
+ list_entry = g_list_find_custom(module->prefs, (gpointer)name,
+ preference_match);
if (list_entry == NULL)
return NULL; /* no such preference */
return (struct preference *) list_entry->data;
gboolean
prefs_is_registered_protocol(char *name)
{
- return (find_module(name) != NULL);
+ module_t *m = find_module(name);
+
+ return (m != NULL && !m->obsolete);
}
/*
prefs_get_title_by_name(char *name)
{
module_t *m = find_module(name);
- return (m) ? m->title : NULL;
+
+ return (m != NULL && !m->obsolete) ? m->title : NULL;
}
/*
preference = register_preference(module, name, title, description);
preference->type = PREF_BOOL;
- preference->varp.bool = var;
+ preference->varp.boolp = var;
}
/*
preference->saved_val.string = NULL;
}
+/*
+ * Register a preference that used to be supported but no longer is.
+ */
+void
+prefs_register_obsolete_preference(module_t *module, const char *name)
+{
+ pref_t *preference;
+
+ preference = register_preference(module, name, NULL, NULL);
+ preference->type = PREF_OBSOLETE;
+}
+
typedef struct {
pref_cb callback;
gpointer user_data;
pref_t *pref = data;
pref_cb_arg_t *arg = user_data;
+ if (pref->type == PREF_OBSOLETE) {
+ /*
+ * This preference is no longer supported; it's not a
+ * real preference, so we don't call the callback for
+ * it (i.e., we treat it as if it weren't found in the
+ * list of preferences, and we weren't called in the
+ * first place).
+ */
+ return;
+ }
+
(*arg->callback)(pref, arg->user_data);
}
static GList *
get_string_list(gchar *str)
{
- gint i = 0, j = 0;
- gboolean in_quot = FALSE, backslash = FALSE;
- gchar cur_c, *slstr = NULL;
+ enum { PRE_STRING, IN_QUOT, NOT_IN_QUOT };
+
+ gint state = PRE_STRING, i = 0, j = 0;
+ gboolean backslash = FALSE;
+ guchar cur_c;
+ gchar *slstr = NULL;
GList *sl = NULL;
/* Allocate a buffer for the first string. */
if (cur_c == '\0') {
/* It's the end of the input, so it's the end of the string we
were working on, and there's no more input. */
- if (in_quot || backslash) {
+ if (state == IN_QUOT || backslash) {
/* We were in the middle of a quoted string or backslash escape,
and ran out of characters; that's an error. */
g_free(slstr);
break;
}
if (cur_c == '"' && ! backslash) {
- if (!in_quot) {
- /* We're not in the middle of a quoted string, and we saw a
- quotation mark; we're now quoting. */
- in_quot = TRUE;
- } else {
- /* We're in the middle of a quoted string, and we saw a quotation
- mark; we're no longer quoting. */
- in_quot = FALSE;
+ switch (state) {
+ case PRE_STRING:
+ /* We hadn't yet started processing a string; this starts the
+ string, and we're now quoting. */
+ state = IN_QUOT;
+ break;
+ case IN_QUOT:
+ /* We're in the middle of a quoted string, and we saw a quotation
+ mark; we're no longer quoting. */
+ state = NOT_IN_QUOT;
+ break;
+ case NOT_IN_QUOT:
+ /* We're working on a string, but haven't seen a quote; we're
+ now quoting. */
+ state = IN_QUOT;
+ break;
+ default:
+ break;
}
} else if (cur_c == '\\' && ! backslash) {
/* We saw a backslash, and the previous character wasn't a
- backslash; escape the next character. */
+ backslash; escape the next character.
+
+ This also means we've started a new string. */
backslash = TRUE;
- } else if (cur_c == ',' && ! in_quot && ! backslash) {
+ if (state == PRE_STRING)
+ state = NOT_IN_QUOT;
+ } else if (cur_c == ',' && state != IN_QUOT && ! backslash) {
/* We saw a comma, and we're not in the middle of a quoted string
and it wasn't preceded by a backslash; it's the end of
the string we were working on... */
sl = g_list_append(sl, slstr);
/* ...and the beginning of a new string. */
+ state = PRE_STRING;
slstr = (gchar *) g_malloc(sizeof(gchar) * COL_MAX_LEN);
j = 0;
- } else {
- /* It's a character to be put into a string; do so if there's room. */
+ } else if (!isspace(cur_c) || state != PRE_STRING) {
+ /* Either this isn't a white-space character, or we've started a
+ string (i.e., already seen a non-white-space character for that
+ string and put it into the string).
+
+ The character is to be put into the string; do so if there's
+ room. */
if (j < COL_MAX_LEN) {
slstr[j] = cur_c;
j++;
return(sl);
}
-void
-clear_string_list(GList *sl) {
+#define MAX_FMT_PREF_LEN 1024
+#define MAX_FMT_PREF_LINE_LEN 60
+static gchar *
+put_string_list(GList *sl)
+{
+ static gchar pref_str[MAX_FMT_PREF_LEN] = "";
+ GList *clp = g_list_first(sl);
+ gchar *str;
+ int cur_pos = 0, cur_len = 0;
+ gchar *quoted_str;
+ int str_len;
+ gchar *strp, *quoted_strp, c;
+ int fmt_len;
+
+ while (clp) {
+ str = clp->data;
+
+ /* Allocate a buffer big enough to hold the entire string, with each
+ character quoted (that's the worst case). */
+ str_len = strlen(str);
+ quoted_str = g_malloc(str_len*2 + 1);
+
+ /* Now quote any " or \ characters in it. */
+ strp = str;
+ quoted_strp = quoted_str;
+ while ((c = *strp++) != '\0') {
+ if (c == '"' || c == '\\') {
+ /* It has to be backslash-quoted. */
+ *quoted_strp++ = '\\';
+ }
+ *quoted_strp++ = c;
+ }
+ *quoted_strp = '\0';
+
+ fmt_len = strlen(quoted_str) + 4;
+ if ((fmt_len + cur_len) < (MAX_FMT_PREF_LEN - 1)) {
+ if ((fmt_len + cur_pos) > MAX_FMT_PREF_LINE_LEN) {
+ /* Wrap the line. */
+ cur_len--;
+ cur_pos = 0;
+ pref_str[cur_len] = '\n'; cur_len++;
+ pref_str[cur_len] = '\t'; cur_len++;
+ }
+ sprintf(&pref_str[cur_len], "\"%s\", ", quoted_str);
+ cur_pos += fmt_len;
+ cur_len += fmt_len;
+ }
+ g_free(quoted_str);
+ clp = clp->next;
+ }
+
+ /* If the string is at least two characters long, the last two characters
+ are ", ", and should be discarded, as there are no more items in the
+ string. */
+ if (cur_len >= 2)
+ pref_str[cur_len - 2] = '\0';
+
+ return(pref_str);
+}
+
+static void
+clear_string_list(GList *sl)
+{
GList *l = sl;
while (l) {
return NULL. */
e_prefs *
read_prefs(int *gpf_errno_return, char **gpf_path_return,
- int *pf_errno_return, char **pf_path_return)
+ int *pf_errno_return, const char **pf_path_return)
{
- int i;
- FILE *pf;
- fmt_data *cfmt;
- gchar *col_fmt[] = {"No.", "%m", "Time", "%t",
- "Source", "%s", "Destination", "%d",
- "Protocol", "%p", "Info", "%i"};
+ int i;
+ const char *pf_path;
+ FILE *pf;
+ fmt_data *cfmt;
+ gchar *col_fmt[] = {"No.", "%m", "Time", "%t",
+ "Source", "%s", "Destination", "%d",
+ "Protocol", "%p", "Info", "%i"};
-
if (init_prefs) {
/* Initialize preferences to wired-in default values.
They may be overridded by the global preferences file or the
*/
prefs.gui_font_name = g_strdup("-*-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-iso8859-1");
#endif
- prefs.gui_marked_fg.pixel = 65535;
- prefs.gui_marked_fg.red = 65535;
- prefs.gui_marked_fg.green = 65535;
- prefs.gui_marked_fg.blue = 65535;
- prefs.gui_marked_bg.pixel = 0;
- prefs.gui_marked_bg.red = 0;
- prefs.gui_marked_bg.green = 0;
- prefs.gui_marked_bg.blue = 0;
+ prefs.gui_marked_fg.pixel = 65535;
+ prefs.gui_marked_fg.red = 65535;
+ prefs.gui_marked_fg.green = 65535;
+ prefs.gui_marked_fg.blue = 65535;
+ prefs.gui_marked_bg.pixel = 0;
+ prefs.gui_marked_bg.red = 0;
+ prefs.gui_marked_bg.green = 0;
+ prefs.gui_marked_bg.blue = 0;
+ prefs.gui_geometry_save_position = 0;
+ prefs.gui_geometry_save_size = 1;
+ prefs.gui_geometry_main_x = 20;
+ prefs.gui_geometry_main_y = 20;
+ prefs.gui_geometry_main_width = DEF_WIDTH;
+ prefs.gui_geometry_main_height = -1;
/* set the default values for the capture dialog box */
- prefs.capture_prom_mode = TRUE;
+ prefs.capture_device = NULL;
+ prefs.capture_prom_mode = TRUE;
prefs.capture_real_time = FALSE;
prefs.capture_auto_scroll = FALSE;
- prefs.name_resolve = PREFS_RESOLV_ALL;
+ prefs.name_resolve = RESOLV_ALL;
+ }
+
+ /* Construct the pathname of the global preferences file. */
+ if (! gpf_path) {
+ gpf_path = (gchar *) g_malloc(strlen(get_datafile_dir()) +
+ strlen(GPF_NAME) + 2);
+ sprintf(gpf_path, "%s" G_DIR_SEPARATOR_S "%s",
+ get_datafile_dir(), GPF_NAME);
}
/* Read the global preferences file, if it exists. */
*gpf_path_return = NULL;
- if ((pf = fopen(GPF_PATH, "r")) != NULL) {
+ if ((pf = fopen(gpf_path, "r")) != NULL) {
/* We succeeded in opening it; read it. */
- read_prefs_file(GPF_PATH, pf);
+ read_prefs_file(gpf_path, pf);
fclose(pf);
} else {
/* We failed to open it. If we failed for some reason other than
caller can report the error. */
if (errno != ENOENT) {
*gpf_errno_return = errno;
- *gpf_path_return = GPF_PATH;
+ *gpf_path_return = gpf_path;
}
}
/* Construct the pathname of the user's preferences file. */
- if (! pf_path) {
- pf_path = (gchar *) g_malloc(strlen(get_home_dir()) + strlen(PF_DIR) +
- strlen(PF_NAME) + 4);
- sprintf(pf_path, "%s/%s/%s", get_home_dir(), PF_DIR, PF_NAME);
- }
+ pf_path = get_persconffile_path(PF_NAME, FALSE);
/* Read the user's preferences file, if it exists. */
*pf_path_return = NULL;
g_warning ("%s line %d: No such preference \"%s\"", pf_path,
pline, cur_var);
break;
+
+ case PREFS_SET_OBSOLETE:
+ /* We silently ignore attempts to set these; it's
+ probably not the user's fault that it's in there -
+ they may have saved preferences with a release that
+ supported them. */
+ break;
}
} else {
g_warning ("%s line %d: Incomplete preference", pf_path, pline);
g_warning ("%s line %d: No such preference \"%s\"", pf_path,
pline, cur_var);
break;
+
+ case PREFS_SET_OBSOLETE:
+ /* We silently ignore attempts to set these; it's probably not
+ the user's fault that it's in there - they may have saved
+ preferences with a release that supported it. */
+ break;
}
} else {
g_warning ("%s line %d: Incomplete preference", pf_path, pline);
#define PRS_GUI_FONT_NAME "gui.font_name"
#define PRS_GUI_MARKED_FG "gui.marked_frame.fg"
#define PRS_GUI_MARKED_BG "gui.marked_frame.bg"
+#define PRS_GUI_GEOMETRY_SAVE_POSITION "gui.geometry.save.position"
+#define PRS_GUI_GEOMETRY_SAVE_SIZE "gui.geometry.save.size"
+#define PRS_GUI_GEOMETRY_MAIN_X "gui.geometry.main.x"
+#define PRS_GUI_GEOMETRY_MAIN_Y "gui.geometry.main.y"
+#define PRS_GUI_GEOMETRY_MAIN_WIDTH "gui.geometry.main.width"
+#define PRS_GUI_GEOMETRY_MAIN_HEIGHT "gui.geometry.main.height"
/*
* This applies to more than just captures, so it's not "capture.name_resolve";
#define PRS_CAP_NAME_RESOLVE "capture.name_resolve"
/* values for the capture dialog box */
-#define PRS_CAP_REAL_TIME "capture.real_time_update"
-#define PRS_CAP_PROM_MODE "capture.prom_mode"
+#define PRS_CAP_DEVICE "capture.device"
+#define PRS_CAP_PROM_MODE "capture.prom_mode"
+#define PRS_CAP_REAL_TIME "capture.real_time_update"
#define PRS_CAP_AUTO_SCROLL "capture.auto_scroll"
#define RED_COMPONENT(x) ((((x) >> 16) & 0xff) * 65535 / 255)
} name_resolve_opt_t;
static name_resolve_opt_t name_resolve_opt[] = {
- { 'm', PREFS_RESOLV_MAC },
- { 'n', PREFS_RESOLV_NETWORK },
- { 't', PREFS_RESOLV_TRANSPORT },
+ { 'm', RESOLV_MAC },
+ { 'n', RESOLV_NETWORK },
+ { 't', RESOLV_TRANSPORT },
};
#define N_NAME_RESOLVE_OPT (sizeof name_resolve_opt / sizeof name_resolve_opt[0])
unsigned int i;
gboolean all_opts_set = TRUE;
- if (name_resolve == PREFS_RESOLV_NONE)
+ if (name_resolve == RESOLV_NONE)
return "FALSE";
p = &string[0];
for (i = 0; i < N_NAME_RESOLVE_OPT; i++) {
static int
set_pref(gchar *pref_name, gchar *value)
{
- GList *col_l;
+ GList *col_l, *col_l_elt;
gint llen;
fmt_data *cfmt;
unsigned long int cval;
gboolean bval;
gint enum_val;
char *p;
- gchar *dotp;
+ gchar *dotp, *last_dotp;
module_t *module;
pref_t *pref;
+ gboolean had_a_dot;
if (strcmp(pref_name, PRS_PRINT_FMT) == 0) {
if (strcmp(value, pr_formats[PR_FMT_TEXT]) == 0) {
clear_string_list(col_l);
return PREFS_SET_SYNTAX_ERR;
}
+ /* Check to make sure all column formats are valid. */
+ col_l_elt = g_list_first(col_l);
+ while(col_l_elt) {
+ /* Make sure the title isn't empty. */
+ if (strcmp(col_l_elt->data, "") == 0) {
+ /* It is. */
+ clear_string_list(col_l);
+ return PREFS_SET_SYNTAX_ERR;
+ }
+
+ /* Go past the title. */
+ col_l_elt = col_l_elt->next;
+
+ /* Check the format. */
+ if (get_column_format_from_str(col_l_elt->data) == -1) {
+ /* It's not a valid column format. */
+ clear_string_list(col_l);
+ return PREFS_SET_SYNTAX_ERR;
+ }
+
+ /* Go past the format. */
+ col_l_elt = col_l_elt->next;
+ }
free_col_info(&prefs);
prefs.col_list = NULL;
llen = g_list_length(col_l);
prefs.num_cols = llen / 2;
- col_l = g_list_first(col_l);
- while(col_l) {
+ col_l_elt = g_list_first(col_l);
+ while(col_l_elt) {
cfmt = (fmt_data *) g_malloc(sizeof(fmt_data));
- cfmt->title = g_strdup(col_l->data);
- col_l = col_l->next;
- cfmt->fmt = g_strdup(col_l->data);
- col_l = col_l->next;
+ cfmt->title = g_strdup(col_l_elt->data);
+ col_l_elt = col_l_elt->next;
+ cfmt->fmt = g_strdup(col_l_elt->data);
+ col_l_elt = col_l_elt->next;
prefs.col_list = g_list_append(prefs.col_list, cfmt);
}
clear_string_list(col_l);
prefs.gui_marked_bg.red = RED_COMPONENT(cval);
prefs.gui_marked_bg.green = GREEN_COMPONENT(cval);
prefs.gui_marked_bg.blue = BLUE_COMPONENT(cval);
+ } else if (strcmp(pref_name, PRS_GUI_GEOMETRY_SAVE_POSITION) == 0) {
+ if (strcasecmp(value, "true") == 0) {
+ prefs.gui_geometry_save_position = TRUE;
+ }
+ else {
+ prefs.gui_geometry_save_position = FALSE;
+ }
+ } else if (strcmp(pref_name, PRS_GUI_GEOMETRY_SAVE_SIZE) == 0) {
+ if (strcasecmp(value, "true") == 0) {
+ prefs.gui_geometry_save_size = TRUE;
+ }
+ else {
+ prefs.gui_geometry_save_size = FALSE;
+ }
+ } else if (strcmp(pref_name, PRS_GUI_GEOMETRY_MAIN_X) == 0) {
+ prefs.gui_geometry_main_x = strtol(value, NULL, 10);
+ } else if (strcmp(pref_name, PRS_GUI_GEOMETRY_MAIN_Y) == 0) {
+ prefs.gui_geometry_main_y = strtol(value, NULL, 10);
+ } else if (strcmp(pref_name, PRS_GUI_GEOMETRY_MAIN_WIDTH) == 0) {
+ prefs.gui_geometry_main_width = strtol(value, NULL, 10);
+ } else if (strcmp(pref_name, PRS_GUI_GEOMETRY_MAIN_HEIGHT) == 0) {
+ prefs.gui_geometry_main_height = strtol(value, NULL, 10);
/* handle the capture options */
+ } else if (strcmp(pref_name, PRS_CAP_DEVICE) == 0) {
+ if (prefs.capture_device != NULL)
+ g_free(prefs.capture_device);
+ prefs.capture_device = g_strdup(value);
} else if (strcmp(pref_name, PRS_CAP_PROM_MODE) == 0) {
prefs.capture_prom_mode = ((strcasecmp(value, "true") == 0)?TRUE:FALSE);
-
} else if (strcmp(pref_name, PRS_CAP_REAL_TIME) == 0) {
prefs.capture_real_time = ((strcasecmp(value, "true") == 0)?TRUE:FALSE);
-
} else if (strcmp(pref_name, PRS_CAP_AUTO_SCROLL) == 0) {
prefs.capture_auto_scroll = ((strcasecmp(value, "true") == 0)?TRUE:FALSE);
strcmp(pref_name, PRS_CAP_NAME_RESOLVE) == 0) {
/*
* "TRUE" and "FALSE", for backwards compatibility, are synonyms for
- * PREFS_RESOLV_ALL and PREFS_RESOLV_NONE.
+ * RESOLV_ALL and RESOLV_NONE.
*
* Otherwise, we treat it as a list of name types we want to resolve.
*/
if (strcasecmp(value, "true") == 0)
- prefs.name_resolve = PREFS_RESOLV_ALL;
+ prefs.name_resolve = RESOLV_ALL;
else if (strcasecmp(value, "false") == 0)
- prefs.name_resolve = PREFS_RESOLV_NONE;
+ prefs.name_resolve = RESOLV_NONE;
else {
- prefs.name_resolve = PREFS_RESOLV_NONE; /* start out with none set */
+ prefs.name_resolve = RESOLV_NONE; /* start out with none set */
if (string_to_name_resolve(value, &prefs.name_resolve) != '\0')
return PREFS_SET_SYNTAX_ERR;
}
} else {
/* To which module does this preference belong? */
- dotp = strchr(pref_name, '.');
- if (dotp == NULL)
- return PREFS_SET_SYNTAX_ERR; /* no ".", so no module/name separator */
- *dotp = '\0'; /* separate module and preference name */
- module = find_module(pref_name);
+ module = NULL;
+ last_dotp = pref_name;
+ had_a_dot = FALSE;
+ while (!module) {
+ dotp = strchr(last_dotp, '.');
+ if (dotp == NULL) {
+ if (had_a_dot) {
+ /* no such module */
+ return PREFS_SET_NO_SUCH_PREF;
+ }
+ else {
+ /* no ".", so no module/name separator */
+ return PREFS_SET_SYNTAX_ERR;
+ }
+ }
+ else {
+ had_a_dot = TRUE;
+ }
+ *dotp = '\0'; /* separate module and preference name */
+ module = find_module(pref_name);
+
+ /*
+ * XXX - "Diameter" rather than "diameter" was used in earlier
+ * versions of Ethereal; if we didn't find the module, and its name
+ * was "Diameter", look for "diameter" instead.
+ *
+ * In addition, the BEEP protocol used to be the BXXP protocol,
+ * so if we didn't find the module, and its name was "bxxp",
+ * look for "beep" instead.
+ *
+ * Also, the preferences for GTP v0 and v1 were combined under
+ * a single "gtp" heading.
+ */
+ if (module == NULL) {
+ if (strcmp(pref_name, "Diameter") == 0)
+ module = find_module("diameter");
+ else if (strcmp(pref_name, "bxxp") == 0)
+ module = find_module("beep");
+ else if (strcmp(pref_name, "gtpv0") == 0 ||
+ strcmp(pref_name, "gtpv1") == 0)
+ module = find_module("gtp");
+ }
+ *dotp = '.'; /* put the preference string back */
+ dotp++; /* skip past separator to preference name */
+ last_dotp = dotp;
+ }
- /*
- * XXX - "Diameter" rather than "diameter" was used in earlier
- * versions of Ethereal; if we didn't find the module, and its name
- * was "Diameter", look for "diameter" instead.
- */
- if (module == NULL && strcmp(pref_name, "Diameter") == 0)
- module = find_module("diameter");
- *dotp = '.'; /* put the preference string back */
- if (module == NULL)
- return PREFS_SET_NO_SUCH_PREF; /* no such module */
- dotp++; /* skip past separator to preference name */
pref = find_preference(module, dotp);
- /*
- * XXX - "mgcp.display raw text toggle" and "mgcp.display dissect tree"
- * rather than "mgcp.display_raw_text" and "mgcp.display_dissect_tree"
- * were used in earlier versions of Ethereal; if we didn't find the
- * preference, it was an MGCP preference, and its name was
- * "display raw text toggle" or "display dissect tree", look for
- * "display_raw_text" or "display_dissect_tree" instead.
- *
- * "mgcp.tcp.port" and "mgcp.udp.port" are harder to handle, as both
- * the gateway and callagent ports were given those names; we interpret
- * the first as "mgcp.{tcp,udp}.gateway_port" and the second as
- * "mgcp.{tcp,udp}.callagent_port", as that's the order in which
- * they were registered by the MCCP dissector and thus that's the
- * order in which they were written to the preferences file. (If
- * we're not reading the preferences file, but are handling stuff
- * from a "-o" command-line option, we have no clue which the user
- * had in mind - they should have used "mgcp.{tcp,udp}.gateway_port"
- * or "mgcp.{tcp,udp}.callagent_port" instead.)
- */
- if (pref == NULL && strncmp(pref_name, "mgcp.", 5) == 0) {
- if (strcmp(dotp, "display raw text toggle") == 0)
- pref = find_preference(module, "display_raw_text");
- else if (strcmp(dotp, "display dissect tree") == 0)
- pref = find_preference(module, "display_dissect_tree");
- else if (strcmp(dotp, "tcp.port") == 0) {
- mgcp_tcp_port_count++;
- if (mgcp_tcp_port_count == 1) {
- /* It's the first one */
- pref = find_preference(module, "tcp.gateway_port");
- } else if (mgcp_tcp_port_count == 2) {
- /* It's the second one */
- pref = find_preference(module, "tcp.callagent_port");
- }
- /* Otherwise it's from the command line, and we don't bother
- mapping it. */
- } else if (strcmp(dotp, "udp.port") == 0) {
- mgcp_udp_port_count++;
- if (mgcp_udp_port_count == 1) {
- /* It's the first one */
- pref = find_preference(module, "udp.gateway_port");
- } else if (mgcp_udp_port_count == 2) {
- /* It's the second one */
- pref = find_preference(module, "udp.callagent_port");
+ if (pref == NULL) {
+ if (strncmp(pref_name, "mgcp.", 5) == 0) {
+ /*
+ * XXX - "mgcp.display raw text toggle" and "mgcp.display dissect tree"
+ * rather than "mgcp.display_raw_text" and "mgcp.display_dissect_tree"
+ * were used in earlier versions of Ethereal; if we didn't find the
+ * preference, it was an MGCP preference, and its name was
+ * "display raw text toggle" or "display dissect tree", look for
+ * "display_raw_text" or "display_dissect_tree" instead.
+ *
+ * "mgcp.tcp.port" and "mgcp.udp.port" are harder to handle, as both
+ * the gateway and callagent ports were given those names; we interpret
+ * the first as "mgcp.{tcp,udp}.gateway_port" and the second as
+ * "mgcp.{tcp,udp}.callagent_port", as that's the order in which
+ * they were registered by the MCCP dissector and thus that's the
+ * order in which they were written to the preferences file. (If
+ * we're not reading the preferences file, but are handling stuff
+ * from a "-o" command-line option, we have no clue which the user
+ * had in mind - they should have used "mgcp.{tcp,udp}.gateway_port"
+ * or "mgcp.{tcp,udp}.callagent_port" instead.)
+ */
+ if (strcmp(dotp, "display raw text toggle") == 0)
+ pref = find_preference(module, "display_raw_text");
+ else if (strcmp(dotp, "display dissect tree") == 0)
+ pref = find_preference(module, "display_dissect_tree");
+ else if (strcmp(dotp, "tcp.port") == 0) {
+ mgcp_tcp_port_count++;
+ if (mgcp_tcp_port_count == 1) {
+ /* It's the first one */
+ pref = find_preference(module, "tcp.gateway_port");
+ } else if (mgcp_tcp_port_count == 2) {
+ /* It's the second one */
+ pref = find_preference(module, "tcp.callagent_port");
+ }
+ /* Otherwise it's from the command line, and we don't bother
+ mapping it. */
+ } else if (strcmp(dotp, "udp.port") == 0) {
+ mgcp_udp_port_count++;
+ if (mgcp_udp_port_count == 1) {
+ /* It's the first one */
+ pref = find_preference(module, "udp.gateway_port");
+ } else if (mgcp_udp_port_count == 2) {
+ /* It's the second one */
+ pref = find_preference(module, "udp.callagent_port");
+ }
+ /* Otherwise it's from the command line, and we don't bother
+ mapping it. */
}
- /* Otherwise it's from the command line, and we don't bother
- mapping it. */
+ } else if (strncmp(pref_name, "smb.", 4) == 0) {
+ /* Handle old names for SMB preferences. */
+ if (strcmp(dotp, "smb.trans.reassembly") == 0)
+ pref = find_preference(module, "trans_reassembly");
+ else if (strcmp(dotp, "smb.dcerpc.reassembly") == 0)
+ pref = find_preference(module, "dcerpc_reassembly");
+ } else if (strncmp(pref_name, "ndmp.", 5) == 0) {
+ /* Handle old names for NDMP preferences. */
+ if (strcmp(dotp, "ndmp.desegment") == 0)
+ pref = find_preference(module, "desegment");
+ } else if (strncmp(pref_name, "diameter.", 9) == 0) {
+ /* Handle old names for Diameter preferences. */
+ if (strcmp(dotp, "diameter.desegment") == 0)
+ pref = find_preference(module, "desegment");
}
}
if (pref == NULL)
bval = TRUE;
else
bval = FALSE;
- if (*pref->varp.bool != bval) {
+ if (*pref->varp.boolp != bval) {
module->prefs_changed = TRUE;
- *pref->varp.bool = bval;
+ *pref->varp.boolp = bval;
}
break;
*pref->varp.string = g_strdup(value);
}
break;
+
+ case PREF_OBSOLETE:
+ return PREFS_SET_OBSOLETE; /* no such preference any more */
}
}
const enum_val_t *enum_valp;
const char *val_string;
+ if (pref->type == PREF_OBSOLETE) {
+ /*
+ * This preference is no longer supported; it's not a
+ * real preference, so we don't write it out (i.e., we
+ * treat it as if it weren't found in the list of
+ * preferences, and we weren't called in the first place).
+ */
+ return;
+ }
+
fprintf(arg->pf, "\n# %s\n", pref->description);
switch (pref->type) {
case PREF_BOOL:
fprintf(arg->pf, "# TRUE or FALSE (case-insensitive).\n");
fprintf(arg->pf, "%s.%s: %s\n", arg->module->name, pref->name,
- *pref->varp.bool ? "TRUE" : "FALSE");
+ *pref->varp.boolp ? "TRUE" : "FALSE");
break;
case PREF_ENUM:
fprintf(arg->pf, "%s.%s: %s\n", arg->module->name, pref->name,
*pref->varp.string);
break;
+
+ case PREF_OBSOLETE:
+ g_assert_not_reached();
+ break;
}
}
If we got an error, stuff a pointer to the path of the preferences file
into "*pf_path_return", and return the errno. */
int
-write_prefs(char **pf_path_return)
+write_prefs(const char **pf_path_return)
{
+ const char *pf_path;
FILE *pf;
- struct stat s_buf;
-
+ GList *clp, *col_l;
+ fmt_data *cfmt;
+
/* To do:
* - Split output lines longer than MAX_VAL_LEN
* - Create a function for the preference directory check/creation
* so that duplication can be avoided with filter.c
*/
- if (! pf_path) {
- pf_path = (gchar *) g_malloc(strlen(get_home_dir()) + strlen(PF_DIR) +
- strlen(PF_NAME) + 4);
- }
-
- sprintf(pf_path, "%s/%s", get_home_dir(), PF_DIR);
- if (stat(pf_path, &s_buf) != 0)
-#ifdef WIN32
- mkdir(pf_path);
-#else
- mkdir(pf_path, 0755);
-#endif
-
- sprintf(pf_path, "%s/%s/%s", get_home_dir(), PF_DIR, PF_NAME);
+ pf_path = get_persconffile_path(PF_NAME, TRUE);
if ((pf = fopen(pf_path, "w")) == NULL) {
*pf_path_return = pf_path;
return errno;
"is set to \"command\"\n"
"%s: %s\n\n", PRS_PRINT_CMD, prefs.pr_cmd);
+ clp = prefs.col_list;
+ col_l = NULL;
+ while (clp) {
+ cfmt = (fmt_data *) clp->data;
+ col_l = g_list_append(col_l, cfmt->title);
+ col_l = g_list_append(col_l, cfmt->fmt);
+ clp = clp->next;
+ }
fprintf (pf, "# Packet list column format. Each pair of strings consists "
"of a column title \n# and its format.\n"
- "%s: %s\n\n", PRS_COL_FMT, col_format_to_pref_str());
+ "%s: %s\n\n", PRS_COL_FMT, put_string_list(col_l));
+ /* This frees the list of strings, but not the strings to which it
+ refers; that's what we want, as we haven't copied those strings,
+ we just referred to them. */
+ g_list_free(col_l);
fprintf (pf, "# TCP stream window color preferences. Each value is a six "
"digit hexadecimal value in the form rrggbb.\n");
(prefs.gui_marked_bg.green * 255 / 65535),
(prefs.gui_marked_bg.blue * 255 / 65535));
+ fprintf(pf, "\n# Save window position at exit? TRUE/FALSE\n");
+ fprintf(pf, PRS_GUI_GEOMETRY_SAVE_POSITION ": %s\n",
+ prefs.gui_geometry_save_position == TRUE ? "TRUE" : "FALSE");
+
+ fprintf(pf, "\n# Save window size at exit? TRUE/FALSE\n");
+ fprintf(pf, PRS_GUI_GEOMETRY_SAVE_SIZE ": %s\n",
+ prefs.gui_geometry_save_size == TRUE ? "TRUE" : "FALSE");
+
+ fprintf(pf, "\n# Main window geometry. Decimal integers.\n");
+ fprintf(pf, PRS_GUI_GEOMETRY_MAIN_X ": %d\n", prefs.gui_geometry_main_x);
+ fprintf(pf, PRS_GUI_GEOMETRY_MAIN_Y ": %d\n", prefs.gui_geometry_main_y);
+ fprintf(pf, PRS_GUI_GEOMETRY_MAIN_WIDTH ": %d\n",
+ prefs.gui_geometry_main_width);
+ fprintf(pf, PRS_GUI_GEOMETRY_MAIN_HEIGHT ": %d\n",
+ prefs.gui_geometry_main_height);
+
fprintf(pf, "\n# Resolve addresses to names? TRUE/FALSE/{list of address types to resolve}\n");
fprintf(pf, PRS_NAME_RESOLVE ": %s\n",
name_resolve_to_string(prefs.name_resolve));
/* write the capture options */
+ if (prefs.capture_device != NULL) {
+ fprintf(pf, "\n# Default capture device\n");
+ fprintf(pf, PRS_CAP_DEVICE ": %s\n", prefs.capture_device);
+ }
+
fprintf(pf, "\n# Capture in promiscuous mode? TRUE/FALSE\n");
fprintf(pf, PRS_CAP_PROM_MODE ": %s\n",
prefs.capture_prom_mode == TRUE ? "TRUE" : "FALSE");
dest->gui_font_name = g_strdup(src->gui_font_name);
dest->gui_marked_fg = src->gui_marked_fg;
dest->gui_marked_bg = src->gui_marked_bg;
+ dest->gui_geometry_save_position = src->gui_geometry_save_position;
+ dest->gui_geometry_save_size = src->gui_geometry_save_size;
+ dest->gui_geometry_main_x = src->gui_geometry_main_x;
+ dest->gui_geometry_main_y = src->gui_geometry_main_y;
+ dest->gui_geometry_main_width = src->gui_geometry_main_width;
+ dest->gui_geometry_main_height = src->gui_geometry_main_height;
/* values for the capture dialog box */
+ dest->capture_device = g_strdup(src->capture_device);
dest->capture_prom_mode = src->capture_prom_mode;
dest->capture_real_time = src->capture_real_time;
dest->capture_auto_scroll = src->capture_auto_scroll;
g_free(pr->gui_font_name);
pr->gui_font_name = NULL;
}
+ if (pr->capture_device != NULL) {
+ g_free(pr->capture_device);
+ pr->capture_device = NULL;
+ }
}
static void
git.samba.org / obnox / wireshark / wip.git / blobdiff