diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-06-17 17:52:31 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-06-17 17:52:31 +0000 |
| commit | 8d88f3a7902d1e44d782fdc96157e70884a9ebf2 (patch) | |
| tree | 2114755f933eee189d1a4ae481381e945a090800 /wiretap | |
| parent | 78f376abc58a5f52f3abe50f4e693bc796e46d03 (diff) | |
Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or
pcap. Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).
Update the documentation and release notes.
svn path=/trunk/; revision=37696
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_access.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index d385412853..0f56d4481a 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -412,6 +412,7 @@ static const struct file_type_info dump_open_table_base[] = { NULL, NULL }, /* WTAP_FILE_PCAP */ + /* Gianluca Varenni suggests that we add "deprecated" to the description. */ { "Wireshark/tcpdump/... - libpcap", "libpcap", "*.pcap;*.cap", ".pcap", FALSE, FALSE, libpcap_dump_can_write_encap, libpcap_dump_open }, @@ -648,7 +649,7 @@ static const struct file_type_info dump_open_table_base[] = { NULL, NULL }, /* WTAP_ENCAP_MIME */ - { "MIME File Format", "mime", NULL, NULL, FALSE, FALSE, + { "MIME File Format", "mime", NULL, NULL, FALSE, FALSE, NULL, NULL } }; |