diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-08-22 03:43:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-08-22 03:43:39 +0000 |
| commit | d6e80b453e4060d64b758915a9c9ee44ce71c6b2 (patch) | |
| tree | b9a24ca8e740b19ac3b62c4afd708bcc3bc470ed /wiretap/file_access.c | |
| parent | 0c550e90905a6f24366935a519cb5ea101615302 (diff) | |
From Stephen Donnelly <stephen.donnelly@emulex.com>:
Move the check for vwr files *after* the check for ERF files, as it
sometimes thinks ERF files are VWR files.
svn path=/trunk/; revision=51467
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 6 |
1 files changed, 5 insertions, 1 deletions
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, |