diff options
| author | David Perry <boolean263@protonmail.com> | 2021-07-12 12:41:57 -0400 |
|---|---|---|
| committer | David Perry <boolean263@protonmail.com> | 2021-07-12 12:41:57 -0400 |
| commit | 06ed6930dc602b5b3b1a79a176272c1846840f8f (patch) | |
| tree | f56b5523b9409634357f1a3aa440dea69d3f1f5a /extcap | |
| parent | 86e2fda11e199b8d0e874147e60a1ba1f0ddb803 (diff) | |
Carry EPB flags as an option on the packet block
As requested by [this comment][1] on !2859, move `pack_flags` from a
dedicated field in `wtap_rec` to a block option on the packet block in
`wtap_rec.block`.
[1]: https://gitlab.com/wireshark/wireshark/-/merge_requests/2859#note_615984624
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 1 | ||||
| -rw-r--r-- | extcap/etl.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 9323e1fc57..e2d65ad8d9 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -505,7 +505,6 @@ static gboolean extcap_dumper_dump(struct extcap_dumper extcap_dumper, rec.block = NULL; rec.rec_header.packet_header.drop_count = 0; - rec.rec_header.packet_header.pack_flags = 0; /* NOTE: Try to handle pseudoheaders manually */ if (extcap_dumper.encap == EXTCAP_ENCAP_BLUETOOTH_H4_WITH_PHDR) { diff --git a/extcap/etl.c b/extcap/etl.c index a8784bacd2..1c39fe8e89 100644 --- a/extcap/etl.c +++ b/extcap/etl.c @@ -587,8 +587,8 @@ void wtap_etl_rec_dump(ULARGE_INTEGER timestamp, WTAP_ETL_RECORD* etl_record, UL rec.rec_header.packet_header.caplen = total_packet_length; rec.rec_header.packet_header.len = total_packet_length; rec.rec_header.packet_header.pkt_encap = WTAP_ENCAP_ETW; - rec.presence_flags = rec.presence_flags | WTAP_HAS_PACK_FLAGS; - rec.rec_header.packet_header.pack_flags = is_inbound ? PACK_FLAGS_DIRECTION_INBOUND : PACK_FLAGS_DIRECTION_OUTBOUND; + rec->block = wtap_block_create(WTAP_BLOCK_PACKET); + wtap_block_add_uint32_option(rec->block, OPT_PKT_FLAGS, is_inbound ? PACK_FLAGS_DIRECTION_INBOUND : PACK_FLAGS_DIRECTION_OUTBOUND); /* Convert usec of the timestamp into nstime_t */ rec.ts.secs = (time_t)(timestamp.QuadPart / G_USEC_PER_SEC); rec.ts.nsecs = (int)(((timestamp.QuadPart % G_USEC_PER_SEC) * G_NSEC_PER_SEC) / G_USEC_PER_SEC); |