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/packet-pcapng_block.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/packet-pcapng_block.c')
| -rw-r--r-- | epan/dissectors/packet-pcapng_block.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-pcapng_block.c b/epan/dissectors/packet-pcapng_block.c index 26e8c50d02..23f051bf76 100644 --- a/epan/dissectors/packet-pcapng_block.c +++ b/epan/dissectors/packet-pcapng_block.c @@ -41,13 +41,13 @@ dissect_pcapng_block(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* * is one. */ if (!dissector_try_uint(pcapng_block_type_dissector_table, - pinfo->pseudo_header->ftsrec.record_type, tvb, pinfo, tree)) { + pinfo->rec->rec_header.ft_specific_header.record_type, tvb, pinfo, tree)) { /* * There isn't one; just do a minimal display. */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAPNG"); col_add_fstr(pinfo->cinfo, COL_INFO, "Pcapng block, type %u", - pinfo->pseudo_header->ftsrec.record_type); + pinfo->rec->rec_header.ft_specific_header.record_type); proto_tree_add_item(tree, proto_pcapng_block, tvb, 0, -1, ENC_NA); } |