Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/awelzel/deprecate-tcp-reassembler-ports'

Browse source 
* origin/topic/awelzel/deprecate-tcp-reassembler-ports:
  init-bare: Deprecate tcp_reassembler_ports
This commit is contained in:
Tim Wojtulewicz 2024-12-05 13:48:46 -07:00
commit 682789a8e9
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -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 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) * ZAM documentation updates for asserts and event handler run-time errors (Vern Paxson, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.1.0-dev.687 7.1.0-dev.689

4
scripts/base/init-bare.zeek
View file

@ -1368,13 +1368,13 @@ const tcp_max_old_segments = 0 &redef;
## that still trigger reassembly. ## that still trigger reassembly.
## ##
## .. zeek:see:: tcp_reassembler_ports_resp ## .. 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 ## For services without a handler, these sets define responder-side ports
## that still trigger reassembly. ## that still trigger reassembly.
## ##
## .. zeek:see:: tcp_reassembler_ports_orig ## .. 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 ## Defines destination TCP ports for which the contents of the originator stream
## should be delivered via :zeek:see:`tcp_contents`. ## should be delivered via :zeek:see:`tcp_contents`.

3
src/NetVar.cc
View file

@ -32,9 +32,6 @@ zeek::RecordType* mime_match;
zeek::RecordType* socks_address; 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_orig;
zeek::TableVal* tcp_content_delivery_ports_resp; zeek::TableVal* tcp_content_delivery_ports_resp;