diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-04-04 04:35:09 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-04-04 04:35:09 +0000 |
| commit | c5d1d8d80e90a87a7d0d50cecc4297881ba30b34 (patch) | |
| tree | 0cc0a19116e26ae42b1793d94c126ec6ea96a361 /wiretap | |
| parent | afb4cff52f0f5b2220055b9a4155f82b9ebfc85d (diff) | |
From Anthony Coddington: don't check for MPEG-2 Transport before
checking for ERF.
From me: note some heuristic checkers that are in the "magic number" set.
#BACKPORT 1.8
svn path=/trunk/; revision=48724
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_access.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index d897c08a79..b02a504dad 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -135,15 +135,14 @@ static wtap_open_routine_t open_routines_base[] = { dbs_etherwatch_open, k12_open, catapult_dct2000_open, - ber_open, + ber_open, /* XXX - this is really a heuristic */ aethra_open, btsnoop_open, eyesdn_open, - vwr_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, - mp2t_open, tnef_open, dct3trace_open, daintree_sna_open, @@ -174,7 +173,8 @@ static wtap_open_routine_t open_routines_base[] = { hcidump_open, commview_open, nstrace_open, - camins_open + camins_open, + mp2t_open }; #define N_FILE_TYPES (sizeof open_routines_base / sizeof open_routines_base[0]) |