diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
commit | 853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch) | |
tree | 94f8afdae71f496fe638550f9e2cea926195b8ee /wiretap/pcap-common.c | |
parent | 5cec175b071b85c7cd392350e2fcc246dc20d41d (diff) |
The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.
Rename various functions, #defines, and variables appropriately.
svn path=/trunk/; revision=53166
Diffstat (limited to 'wiretap/pcap-common.c')
-rw-r--r-- | wiretap/pcap-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index c5013a9dc6..66d81dfc9a 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -1513,7 +1513,7 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, switch (wtap_encap) { case WTAP_ENCAP_ATM_PDUS: - if (file_type == WTAP_FILE_PCAP_NOKIA) { + if (file_type == WTAP_FILE_TYPE_SUBTYPE_PCAP_NOKIA) { /* * Nokia IPSO ATM. */ @@ -1555,7 +1555,7 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, break; case WTAP_ENCAP_ETHERNET: - if (file_type == WTAP_FILE_PCAP_NOKIA) { + if (file_type == WTAP_FILE_TYPE_SUBTYPE_PCAP_NOKIA) { /* * Nokia IPSO. Psuedo header has already been read, but it's not considered * part of the packet size, so reread it to store the data for later (when saving) @@ -1792,7 +1792,7 @@ pcap_read_post_process(int file_type, int wtap_encap, switch (wtap_encap) { case WTAP_ENCAP_ATM_PDUS: - if (file_type == WTAP_FILE_PCAP_NOKIA) { + if (file_type == WTAP_FILE_TYPE_SUBTYPE_PCAP_NOKIA) { /* * Nokia IPSO ATM. * |