diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-06 12:35:11 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-02-06 20:35:47 +0000 |
| commit | cb1a6528f968c3cd97660217abc1a6725ff5ba92 (patch) | |
| tree | aee1d32c85897e2f769d56c454a17505cce0d4e6 /epan/dissectors/file-file.c | |
| parent | 6db88da7f7ffd7f75bb2e06e269bd28537f10ac1 (diff) | |
Get rid of the pkt_encap field in struct packet_info.
pinfo->pkt_encap is jsut a copy of pinfo->phdr->pkt_encap; no need for
the copy.
Expand a comment while we're at it.
Change-Id: I5fcfe694ecba42507f1d629d01440da0a0989501
Reviewed-on: https://code.wireshark.org/review/25643
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/file-file.c')
| -rw-r--r-- | epan/dissectors/file-file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/file-file.c b/epan/dissectors/file-file.c index f926a75077..f336494f5c 100644 --- a/epan/dissectors/file-file.c +++ b/epan/dissectors/file-file.c @@ -121,7 +121,7 @@ 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->pkt_encap); + proto_tree_add_int(fh_tree, hf_file_ftap_encap, tvb, 0, 0, pinfo->phdr->pkt_encap); proto_tree_add_uint(fh_tree, hf_file_record_number, tvb, 0, 0, pinfo->num); @@ -177,12 +177,12 @@ dissect_file_record(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, */ __try { #endif - if (!dissector_try_uint(file_encap_dissector_table, pinfo->pkt_encap, + if (!dissector_try_uint(file_encap_dissector_table, pinfo->phdr->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->pkt_encap); + pinfo->phdr->pkt_encap); call_data_dissector(tvb, pinfo, parent_tree); } #ifdef _MSC_VER |