From 14881e72d63d25048464155c5e8cc43a51731b16 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 21 Feb 2016 09:40:18 -0500 Subject: tshark: load decode_as_entries file With Wireshark 2.0, some dissector preferences were removed in favor of 'Decode As' functionality. But the settings saved in the GUI are not loaded in tshark, preventing their use without an explicit call to '-d' option. Let's load decode_as_entries file by default and have it overridden by the '-d' option if required. Ping-Bug: 12124 Change-Id: I134a424cb6cf8fc89b7096a659ef1605314a70a2 Reviewed-on: https://code.wireshark.org/review/13956 Petri-Dish: Michael Mann Reviewed-by: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- tshark.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tshark.c') diff --git a/tshark.c b/tshark.c index 08929b13e8..786afe8371 100644 --- a/tshark.c +++ b/tshark.c @@ -85,6 +85,7 @@ #endif #include "ui/util.h" #include "ui/ui_util.h" +#include "ui/decode_as_utils.h" #include "ui/cli/tshark-tap.h" #include "register.h" #include "filter_files.h" @@ -1297,6 +1298,9 @@ main(int argc, char *argv[]) return 0; } + /* load the decode as entries of this profile */ + load_decode_as_entries(); + tshark_debug("tshark reading preferences"); prefs_p = read_prefs(&gpf_open_errno, &gpf_read_errno, &gpf_path, -- cgit v1.2.3