diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-08 16:19:12 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-02-09 00:29:51 +0000 |
| commit | 1f5f63f8ef98bfe9c4d734674cee0df64855555d (patch) | |
| tree | 133dd3563cc8d2d29dd85d4d43cd9a4636283192 /epan/dissectors/file-file.c | |
| parent | e4c5efafb7da2d25b7d47fe2dac3b1556c0b67b0 (diff) | |
Generalize wtap_pkthdr into a structure for packet and non-packet records.
Separate the stuff that any record could have from the stuff that only
particular record types have; put the latter into a union, and put all
that into a wtap_rec structure.
Add some record-type checks as necessary.
Change-Id: Id6b3486858f826fce4b096c59231f463e44bfaa2
Reviewed-on: https://code.wireshark.org/review/25696
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/file-file.c')
| -rw-r--r-- | epan/dissectors/file-file.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index f336494f5c..fb5be48088 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -121,7 +121,8 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, fh_tree = proto_item_add_subtree(ti, ett_file); - proto_tree_add_int(fh_tree, hf_file_ftap_encap, tvb, 0, 0, pinfo->phdr->pkt_encap); + if (pinfo->rec->rec_type == REC_TYPE_PACKET) + proto_tree_add_int(fh_tree, hf_file_ftap_encap, tvb, 0, 0, pinfo->rec->rec_header.packet_header.pkt_encap); proto_tree_add_uint(fh_tree, hf_file_record_number, tvb, 0, 0, pinfo->num); @@ -177,12 +178,13 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, */ __try { #endif - if (!dissector_try_uint(file_encap_dissector_table, pinfo->phdr->pkt_encap, + if (pinfo->rec->rec_type != REC_TYPE_PACKET || + !dissector_try_uint(file_encap_dissector_table, pinfo->rec->rec_header.packet_header.pkt_encap, tvb, pinfo, parent_tree)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); col_add_fstr(pinfo->cinfo, COL_INFO, "FTAP_ENCAP = %d", - pinfo->phdr->pkt_encap); + pinfo->rec->rec_header.packet_header.pkt_encap); call_data_dissector(tvb, pinfo, parent_tree); } #ifdef _MSC_VER |