diff --git a/CHANGES b/CHANGES index 32d1d7edf9..13128c9cec 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.1.0-dev.689 | 2024-12-05 13:48:46 -0700 + + * init-bare: Deprecate tcp_reassembler_ports (Arne Welzel, Corelight) + + ...and remove from NetVar, seems left-over. + 7.1.0-dev.687 | 2024-12-05 21:43:49 +0100 * ZAM documentation updates for asserts and event handler run-time errors (Vern Paxson, Corelight) diff --git a/VERSION b/VERSION index a69764eb5b..5702ab9253 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.0-dev.687 +7.1.0-dev.689 diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek index f0251f483b..ca57925603 100644 --- a/scripts/base/init-bare.zeek +++ b/scripts/base/init-bare.zeek @@ -1368,13 +1368,13 @@ const tcp_max_old_segments = 0 &redef; ## that still trigger reassembly. ## ## .. zeek:see:: tcp_reassembler_ports_resp -const tcp_reassembler_ports_orig: set[port] = {} &redef; +const tcp_reassembler_ports_orig: set[port] = {} &redef &deprecated="Remove in v8.1. Non-functional since v4.1"; ## For services without a handler, these sets define responder-side ports ## that still trigger reassembly. ## ## .. zeek:see:: tcp_reassembler_ports_orig -const tcp_reassembler_ports_resp: set[port] = {} &redef; +const tcp_reassembler_ports_resp: set[port] = {} &redef &deprecated="Remove in v8.1. Non-functional since v4.1"; ## Defines destination TCP ports for which the contents of the originator stream ## should be delivered via :zeek:see:`tcp_contents`. diff --git a/src/NetVar.cc b/src/NetVar.cc index ea3730f43f..65251f1f53 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -32,9 +32,6 @@ zeek::RecordType* mime_match; zeek::RecordType* socks_address; -zeek::TableVal* tcp_reassembler_ports_orig; -zeek::TableVal* tcp_reassembler_ports_resp; - zeek::TableVal* tcp_content_delivery_ports_orig; zeek::TableVal* tcp_content_delivery_ports_resp;