osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of unused WTAP_FILE_WTAP file type. 

Move pcap-NG right after standard pcap in the list of file types, so
that it shows up early in the list of output file types in the "Save
As..." dialog box (if, that is, it's supported; if not, neither is pcap,
as they use the same link-layer header type values).

svn path=/trunk/; revision=40493
This commit is contained in:
Guy Harris 2012-01-14 09:12:05 +00:00
parent 37ffde4018
commit eb5c7d64a4
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wiretap/file_access.c
View File

@ -409,15 +409,15 @@ static const struct file_type_info dump_open_table_base[] = {
{ NULL, NULL, NULL, NULL, FALSE, FALSE,
NULL, NULL },
/* WTAP_FILE_WTAP (only used internally while capturing) */
{ NULL, NULL, NULL, NULL, FALSE, FALSE,
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 },
/* WTAP_FILE_PCAPNG */
{ "Wireshark - pcapng", "pcapng", "*.pcapng", NULL, FALSE, TRUE,
pcapng_dump_can_write_encap, pcapng_dump_open },
/* WTAP_FILE_PCAP_NSEC */
{ "Wireshark - nanosecond libpcap", "nseclibpcap", "*.pcap;*.cap", ".pcap", FALSE, FALSE,
libpcap_dump_can_write_encap, libpcap_dump_open },
@ -606,10 +606,6 @@ static const struct file_type_info dump_open_table_base[] = {
{ "TamoSoft CommView", "commview", "*.ncf", ".ncf", FALSE, FALSE,
commview_dump_can_write_encap, commview_dump_open },
/* WTAP_FILE_PCAPNG */
{ "Wireshark - pcapng", "pcapng", "*.pcapng", NULL, FALSE, TRUE,
pcapng_dump_can_write_encap, pcapng_dump_open },
/* WTAP_FILE_BTSNOOP */
{ "Symbian OS btsnoop", "btsnoop", "*.log", ".log", FALSE, FALSE,
btsnoop_dump_can_write_encap, btsnoop_dump_open_h4 },

29
wiretap/wtap.h
View File

@ -234,8 +234,8 @@ extern "C" {
We support writing some many of these file types, too, so we
distinguish between different versions of them. */
#define WTAP_FILE_UNKNOWN 0
#define WTAP_FILE_WTAP 1
#define WTAP_FILE_PCAP 2
#define WTAP_FILE_PCAP 1
#define WTAP_FILE_PCAPNG 2
#define WTAP_FILE_PCAP_NSEC 3
#define WTAP_FILE_PCAP_AIX 4
#define WTAP_FILE_PCAP_SS991029 5
@ -283,19 +283,18 @@ extern "C" {
#define WTAP_FILE_K12TEXT 47
#define WTAP_FILE_NETSCREEN 48
#define WTAP_FILE_COMMVIEW 49
#define WTAP_FILE_PCAPNG 50
#define WTAP_FILE_BTSNOOP 51
#define WTAP_FILE_X2E_XORAYA 52
#define WTAP_FILE_TNEF 53
#define WTAP_FILE_DCT3TRACE 54
#define WTAP_FILE_PACKETLOGGER 55
#define WTAP_FILE_DAINTREE_SNA 56
#define WTAP_FILE_NETSCALER_1_0 57
#define WTAP_FILE_NETSCALER_2_0 58
#define WTAP_FILE_JPEG_JFIF 59 /* obsoleted by WTAP_FILE_MIME */
#define WTAP_FILE_IPFIX 60
#define WTAP_FILE_MIME 61
#define WTAP_FILE_AETHRA 62
#define WTAP_FILE_BTSNOOP 50
#define WTAP_FILE_X2E_XORAYA 51
#define WTAP_FILE_TNEF 52
#define WTAP_FILE_DCT3TRACE 53
#define WTAP_FILE_PACKETLOGGER 54
#define WTAP_FILE_DAINTREE_SNA 55
#define WTAP_FILE_NETSCALER_1_0 56
#define WTAP_FILE_NETSCALER_2_0 57
#define WTAP_FILE_JPEG_JFIF 58 /* obsoleted by WTAP_FILE_MIME */
#define WTAP_FILE_IPFIX 59
#define WTAP_FILE_MIME 60
#define WTAP_FILE_AETHRA 61
#define WTAP_NUM_FILE_TYPES wtap_get_num_file_types()