From a4609262b0019d67045f3e15a9db1220a631dbed Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 22 Aug 2013 03:40:30 +0000 Subject: Copy over r51462 from trunk: ------------------------------------------------------------------------ r51462 | guy | 2013-08-21 20:21:47 -0700 (Wed, 21 Aug 2013) | 8 lines What was I thinking? ".caz" is used for compressed *Windows* Sniffer files (which are just gzipped uncompressed Windows Sniffer files, albeit with the checksum computed differently in some fashion, or perhaps just being computed incorrectly), not compressed *DOS* Sniffer files (which use their own form of compression, which doesn't compress the entire file, just most of it, and which use the same extensions as uncompressed DOS Sniffer files). svn path=/trunk/; revision=51465 --- wiretap/file_access.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wiretap/file_access.c') diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 3fba56d0ed..356f8374f3 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -140,7 +140,6 @@ static wtap_open_routine_t open_routines_base[] = { aethra_open, btsnoop_open, eyesdn_open, - vwr_open, /* XXX - this is really a heuristic */ packetlogger_open, /* This type does not have a magic number, but its * files are sometimes grabbed by mpeg_open. */ mpeg_open, @@ -158,9 +157,14 @@ static wtap_open_routine_t open_routines_base[] = { /* I put NetScreen *before* erf, because there were some * false positives with my test-files (Sake Blok, July 2007) + * + * I put VWR *after* ERF, because there were some cases where + * ERF files were misidentified as vwr files (Stephen + * Donnelly, August 2013; see bug 9054) */ netscreen_open, erf_open, + vwr_open, ipfix_open, k12text_open, peekclassic_open, -- cgit v1.2.3