aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-03-27 12:55:14 -0700
committerGuy Harris <guy@alum.mit.edu>2016-03-27 19:56:55 +0000
commitb706fc64cace755614b63b8ed957b70eef3a4862 (patch)
tree9473e86d7946f64b77ff88b9487ac8eb708428d2 /wiretap
parent23a02b2b3924d27568a54286b824369af6d510f0 (diff)
Treat Gammu DCT3 trace files as having magic numbers.
Otherwise, they get treated as generic XML files. No, a standard XML tag, followed by <dump>, isn't a *perfect* magic number, but if you *really* want to read it as a generic XML file, you can do so from the UI. (This is just like TNEF files.) Change-Id: I7624023ecf87a21ef339222c89b3c9abd7acc727 Reviewed-on: https://code.wireshark.org/review/14656 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/file_access.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 4e755fff68..0e923be196 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -330,6 +330,8 @@ static struct open_info open_info_base[] = {
{ "Transport-Neutral Encapsulation Format", OPEN_INFO_MAGIC, tnef_open, NULL, NULL, NULL },
/* 3GPP TS 32.423 Trace must come before MIME Files as it's XML based*/
{ "3GPP TS 32.423 Trace format", OPEN_INFO_MAGIC, nettrace_3gpp_32_423_file_open, NULL, NULL, NULL },
+ /* Gammu DCT3 trace must come before MIME files as it's XML based*/
+ { "Gammu DCT3 trace", OPEN_INFO_MAGIC, dct3trace_open, NULL, NULL, NULL },
{ "MIME Files Format", OPEN_INFO_MAGIC, mime_file_open, NULL, NULL, NULL },
{ "Novell LANalyzer", OPEN_INFO_HEURISTIC, lanalyzer_open, "tr1", NULL, NULL },
/*
@@ -339,7 +341,6 @@ static struct open_info open_info_base[] = {
{ "OS X PacketLogger", OPEN_INFO_HEURISTIC, packetlogger_open, "pklg", NULL, NULL },
/* Some MPEG files have magic numbers, others just have heuristics. */
{ "MPEG", OPEN_INFO_HEURISTIC, mpeg_open, "mpg;mp3", NULL, NULL },
- { "Gammu DCT3 trace", OPEN_INFO_HEURISTIC, dct3trace_open, "xml", NULL, NULL },
{ "Daintree SNA", OPEN_INFO_HEURISTIC, daintree_sna_open, "dcf", NULL, NULL },
{ "STANAG 4607 Format", OPEN_INFO_HEURISTIC, stanag4607_open, NULL, NULL, NULL },
{ "ASN.1 Basic Encoding Rules", OPEN_INFO_HEURISTIC, ber_open, NULL, NULL, NULL },