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/snoop.c | |
| parent | 5cec175b071b85c7cd392350e2fcc246dc20d41d (diff) | |
| download | wireshark-853da2eb9ba1732b37d3f47319bc94471d9c0e16.tar.gz | |
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/snoop.c')
| -rw-r--r-- | wiretap/snoop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/snoop.c b/wiretap/snoop.c index c37ba064f7..ccde4f57c4 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -397,7 +397,7 @@ int snoop_open(wtap *wth, int *err, gchar **err_info) file_encap = shomiti_encap[hdr.network]; /* This is a Shomiti file */ - wth->file_type = WTAP_FILE_SHOMITI; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_SHOMITI; } else if (hdr.network & SNOOP_PRIVATE_BIT) { if ((hdr.network^SNOOP_PRIVATE_BIT) >= NUM_SNOOP_PRIVATE_ENCAPS || snoop_private_encap[hdr.network^SNOOP_PRIVATE_BIT] == WTAP_ENCAP_UNKNOWN) { @@ -409,7 +409,7 @@ int snoop_open(wtap *wth, int *err, gchar **err_info) file_encap = snoop_private_encap[hdr.network^SNOOP_PRIVATE_BIT]; /* This is a snoop file */ - wth->file_type = WTAP_FILE_SNOOP; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_SNOOP; } else { if (hdr.network >= NUM_SNOOP_ENCAPS || snoop_encap[hdr.network] == WTAP_ENCAP_UNKNOWN) { @@ -421,7 +421,7 @@ int snoop_open(wtap *wth, int *err, gchar **err_info) file_encap = snoop_encap[hdr.network]; /* This is a snoop file */ - wth->file_type = WTAP_FILE_SNOOP; + wth->file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_SNOOP; } /* @@ -600,7 +600,7 @@ snoop_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, * this frame; if this is a Shomit file, we assume there * is. (XXX - or should we treat it a "maybe"?) */ - if (wth->file_type == WTAP_FILE_SHOMITI) + if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_SHOMITI) phdr->pseudo_header.eth.fcs_len = 4; else phdr->pseudo_header.eth.fcs_len = 0; |