diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-07-26 06:04:34 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-07-26 06:04:34 +0000 |
| commit | 7de3b988bd496445c2cb4437114a88c1777fce06 (patch) | |
| tree | c544caebc0582443cae43364971ad76843dd21ba /wiretap/file.c | |
| parent | dd094a889110358b40081414fdde206fc2c4060d (diff) | |
In the final scene of the horror movie, just when you think the monster
is finally dead, and you're walking away, it springs up again and
attacks.
It appears that the ss990915 version of Alexey Kuznetzov's libpcap patch
has some extra stuff in the per-packet header for some sort of SMP
debugging, and that SuSE Linux 6.3 picked it up.
Thus, even if a libpcap file has the modified magic number, we *still*
have to go through the usual heuristic hell to figure out what type of
file it is.
svn path=/trunk/; revision=2164
Diffstat (limited to 'wiretap/file.c')
| -rw-r--r-- | wiretap/file.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/wiretap/file.c b/wiretap/file.c index e113c0f5ce..c95eee5cef 100644 --- a/wiretap/file.c +++ b/wiretap/file.c @@ -1,6 +1,6 @@ /* file.c * - * $Id: file.c,v 1.55 2000/07/20 09:39:43 guy Exp $ + * $Id: file.c,v 1.56 2000/07/26 06:04:32 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -229,12 +229,16 @@ const static struct file_type_info { { "libpcap (tcpdump, Ethereal, etc.)", "libpcap", libpcap_dump_can_write_encap, libpcap_dump_open }, - /* WTAP_FILE_PCAP_MODIFIED */ - { "modified libpcap (tcpdump)", "modlibpcap", + /* WTAP_FILE_PCAP_SS990417 */ + { "Red Hat Linux 6.1 libpcap (tcpdump)", "rh6_1libpcap", libpcap_dump_can_write_encap, libpcap_dump_open }, - /* WTAP_FILE_PCAP_RH_6_1 */ - { "Red Hat Linux 6.1 libpcap (tcpdump)", "rh6_1libpcap", + /* WTAP_FILE_PCAP_SS990915 */ + { "SuSE Linux 6.3 libpcap (tcpdump)", "suse6_3libpcap", + libpcap_dump_can_write_encap, libpcap_dump_open }, + + /* WTAP_FILE_PCAP_SS991029 */ + { "modified libpcap (tcpdump)", "modlibpcap", libpcap_dump_can_write_encap, libpcap_dump_open }, /* WTAP_FILE_LANALYZER */ |