aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/file_access.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2012-04-26 03:21:29 +0000
committerGuy Harris <guy@alum.mit.edu>2012-04-26 03:21:29 +0000
commit28175cbf9ac30d107485d68bd4857bd67adc9a5d (patch)
tree401c968374771bde7d5d43203fe81191b38bfca8 /wiretap/file_access.c
parent51633791a9eb1140edf59f335261bd374d9d4e6b (diff)
Put pcapng_open() right after libpcap_open(); pcap and pcap-ng are our
native file formats, so try them first. Move eyesdn_open() to the section for open routines for file formats that have a magic number - EyeSDN traces all start with "EyeSDN". svn path=/trunk/; revision=42250
Diffstat (limited to 'wiretap/file_access.c')
-rw-r--r--wiretap/file_access.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 23e17a4bcc..62b72e83c0 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -112,6 +112,7 @@ static wtap_open_routine_t open_routines_base[] = {
* are easy to identify.
*/
libpcap_open,
+ pcapng_open,
lanalyzer_open,
ngsniffer_open,
snoop_open,
@@ -128,9 +129,9 @@ static wtap_open_routine_t open_routines_base[] = {
k12_open,
catapult_dct2000_open,
ber_open,
- pcapng_open,
aethra_open,
btsnoop_open,
+ eyesdn_open,
vwr_open,
packetlogger_open, /* This type does not have a magic number, but its
* files are sometimes grabbed by mpeg_open. */
@@ -158,7 +159,6 @@ static wtap_open_routine_t open_routines_base[] = {
pppdump_open,
iseries_open,
ascend_open,
- eyesdn_open,
toshiba_open,
i4btrace_open,
csids_open,