aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/file_access.c
diff options
context:
space:
mode:
Diffstat (limited to 'wiretap/file_access.c')
-rw-r--r--wiretap/file_access.c6
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,