From 73087d6fb486a61e8eb0886a02e6c6403534fa36 Mon Sep 17 00:00:00 2001 From: David Perry Date: Thu, 29 Apr 2021 07:23:21 -0400 Subject: Use wtap_blocks for packet comments Mostly functioning proof of concept for #14329. This work is intended to allow Wireshark to support multiple packet comments per packet. Uses and expands upon the `wtap_block` API in `wiretap/wtap_opttypes.h`. It attaches a `wtap_block` structure to `wtap_rec` in place of its current `opt_comment` and `packet_verdict` members to hold OPT_COMMENT and OPT_PKT_VERDICT option values. --- test/lua/acme_file.lua | 1 - test/lua/globals_2.2.txt | 1 - 2 files changed, 2 deletions(-) (limited to 'test/lua') diff --git a/test/lua/acme_file.lua b/test/lua/acme_file.lua index 66d12d6c6d..f159ba2d45 100644 --- a/test/lua/acme_file.lua +++ b/test/lua/acme_file.lua @@ -666,7 +666,6 @@ function Packet:set_wslua_fields(frame) frame.flags = wtap_presence_flags.TS -- for timestamp if self.comment then frame.comment = self.comment - frame.flags = frame.flags + wtap_presence_flags.COMMENTS -- comment flag end return true end diff --git a/test/lua/globals_2.2.txt b/test/lua/globals_2.2.txt index 9f83d033c0..3ae1adba7c 100644 --- a/test/lua/globals_2.2.txt +++ b/test/lua/globals_2.2.txt @@ -1217,7 +1217,6 @@ }, ["wtap_presence_flags"] = { ["CAP_LEN"] = 2, - ["COMMENTS"] = 8, ["DROP_COUNT"] = 16, ["INTERFACE_ID"] = 4, ["PACK_FLAGS"] = 32, -- cgit v1.2.3