diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-17 17:37:21 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-18 00:37:51 +0000 |
| commit | 4ce54674b3c8d3782a744718646ddd0104b45e68 (patch) | |
| tree | 708135a67d1846dccc665b9c67edf39ede9f28e2 /wiretap | |
| parent | ce6430e35e137b981cb18e286e546eae3c1f6b3c (diff) | |
| download | wireshark-4ce54674b3c8d3782a744718646ddd0104b45e68.tar.gz | |
Just say "pcap" in the short names of all pcap variants.
That's more consistent.
Handle the "libpcap" names for backwards compatibility.
Change-Id: I819404d69bddd733b7ee38e23d3ddc71110c0faf
Reviewed-on: https://code.wireshark.org/review/21172
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file_access.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 89dd5a8f5f..990f822d63 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -1227,32 +1227,32 @@ static const struct file_type_subtype_info dump_open_table_base[] = { pcapng_dump_can_write_encap, pcapng_dump_open, NULL }, /* WTAP_FILE_TYPE_SUBTYPE_PCAP_NSEC */ - { "Wireshark - nanosecond libpcap", "nseclibpcap", "pcap", "cap;dmp", + { "Wireshark/tcpdump/... - nanosecond pcap", "nsecpcap", "pcap", "cap;dmp", FALSE, FALSE, 0, libpcap_dump_can_write_encap, libpcap_dump_open, NULL }, /* WTAP_FILE_TYPE_SUBTYPE_PCAP_AIX */ - { "AIX tcpdump - libpcap", "aixlibpcap", "pcap", "cap;dmp", + { "AIX tcpdump - pcap", "aixpcap", "pcap", "cap;dmp", FALSE, FALSE, 0, NULL, NULL, NULL }, /* WTAP_FILE_TYPE_SUBTYPE_PCAP_SS991029 */ - { "Modified tcpdump - libpcap", "modlibpcap", "pcap", "cap;dmp", + { "Modified tcpdump - pcap", "modpcap", "pcap", "cap;dmp", FALSE, FALSE, 0, libpcap_dump_can_write_encap, libpcap_dump_open, NULL }, /* WTAP_FILE_TYPE_SUBTYPE_PCAP_NOKIA */ - { "Nokia tcpdump - libpcap ", "nokialibpcap", "pcap", "cap;dmp", + { "Nokia tcpdump - pcap ", "nokiapcap", "pcap", "cap;dmp", FALSE, FALSE, 0, libpcap_dump_can_write_encap, libpcap_dump_open, NULL }, /* WTAP_FILE_TYPE_SUBTYPE_PCAP_SS990417 */ - { "RedHat 6.1 tcpdump - libpcap", "rh6_1libpcap", "pcap", "cap;dmp", + { "RedHat 6.1 tcpdump - pcap", "rh6_1pcap", "pcap", "cap;dmp", FALSE, FALSE, 0, libpcap_dump_can_write_encap, libpcap_dump_open, NULL }, /* WTAP_FILE_TYPE_SUBTYPE_PCAP_SS990915 */ - { "SuSE 6.3 tcpdump - libpcap", "suse6_3libpcap", "pcap", "cap;dmp", + { "SuSE 6.3 tcpdump - pcap", "suse6_3pcap", "pcap", "cap;dmp", FALSE, FALSE, 0, libpcap_dump_can_write_encap, libpcap_dump_open, NULL }, @@ -1986,12 +1986,25 @@ wtap_short_string_to_file_type_subtype(const char *short_name) } /* - * We now call the "libpcap" file format just "pcap", but we - * allow it to be specified as "libpcap" as well, for - * backwards compatibility. + * We now call the libpcap file format just pcap, but we allow + * the various variants of it to be specified using names + * containing "libpcap" as well as "pcap", for backwards + * compatibility. */ if (strcmp(short_name, "libpcap") == 0) return WTAP_FILE_TYPE_SUBTYPE_PCAP; + else if (strcmp(short_name, "nseclibpcap") == 0) + return WTAP_FILE_TYPE_SUBTYPE_PCAP_NSEC; + else if (strcmp(short_name, "aixlibpcap") == 0) + return WTAP_FILE_TYPE_SUBTYPE_PCAP_AIX; + else if (strcmp(short_name, "modlibpcap") == 0) + return WTAP_FILE_TYPE_SUBTYPE_PCAP_SS991029; + else if (strcmp(short_name, "nokialibpcap") == 0) + return WTAP_FILE_TYPE_SUBTYPE_PCAP_NOKIA; + else if (strcmp(short_name, "rh6_1libpcap") == 0) + return WTAP_FILE_TYPE_SUBTYPE_PCAP_SS990417; + else if (strcmp(short_name, "suse6_3libpcap") == 0) + return WTAP_FILE_TYPE_SUBTYPE_PCAP_SS990915; return -1; /* no such file type, or we can't write it */ } |