Pull request #3802: build: generate and tag 3.1.59.0

Merge in SNORT/snort3 from ~PRBG/snort3:build_3.1.59.0 to master

Squashed commit of the following:

commit c6153096f840bc6a00588b108b1f5aeb0260bc2a
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Thu Apr 6 17:21:16 2023 -0400

    build: generate and tag 3.1.59.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37805470d69336f06708c9cdddd27bf6c884e794..bddd80987903a6c5c0b383891413202c0a6b2830 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 1)
-set (VERSION_PATCH 58)
+set (VERSION_PATCH 59)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index cc16cc25d5422be9695bcd7ef7dc5496093b3ca1..95e25e700b7a55a9d9a58071f460aaab5931cbb9 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,14 @@
+2023-04-06: 3.1.59.0
+
+* file_api: handling file cache context
+* flow_cache: prune multiple flows
+* http2_inspect: clear flow stream_intf with flow_data
+* http2_inspect: make flow data reload safe
+* memory: subtract the allocated memory from the thread pruned before comparing to the target
+* stream: store thread local flow control pointer in global
+* thread_config: add preemptive watchdog kick for flow deletion
+* thread_config: remove message use in watchdog timer
+
 2023-03-22: 3.1.58.0
 
 * actions: restore rtn check in Actions::alert and add to Actions::log

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 6014aa2e7ce81f28223f8702adf7d986ec82c854..04964c3e88b8c85293f7e58e0a805ba325108d53 100644 (file)
--- a/doc/reference/snort_reference.text
+++ b/doc/reference/snort_reference.text
@@ -8,7 +8,7 @@ Snort 3 Reference Manual
 The Snort Team
 
 Revision History
-Revision 3.1.58.0 2023-03-22 11:45:40 EDT TST
+Revision 3.1.59.0 2023-04-06 17:15:48 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -5527,6 +5527,8 @@ Configuration:
   * bool stream.ip_frags_only = false: don’t process non-frag flows
   * int stream.max_flows = 476288: maximum simultaneous flows tracked
     before pruning { 2:max32 }
+  * int stream.prune_flows = 10: maximum flows to prune at one time {
+    1:max32 }
   * int stream.pruning_timeout = 30: minimum inactive time before
     being eligible for pruning { 1:max32 }
   * int stream.held_packet_timeout = 1000: timeout in milliseconds
@@ -10850,6 +10852,8 @@ libraries see the Getting Started section of the manual.
     1:max31 }
   * int stream.max_flows = 476288: maximum simultaneous flows tracked
     before pruning { 2:max32 }
+  * int stream.prune_flows = 10: maximum flows to prune at one time {
+    1:max32 }
   * int stream.pruning_timeout = 30: minimum inactive time before
     being eligible for pruning { 1:max32 }
   * enum stream_reassemble.action: stop or start stream reassembly { 

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 0fa2613da9545f32d1965ef1ad2d4006eed6b427..f6288ccc6fc60684adf0ae26056acff8a28fedc1 100644 (file)
--- a/doc/upgrade/snort_upgrade.text
+++ b/doc/upgrade/snort_upgrade.text
@@ -8,7 +8,7 @@ Snort 3 Upgrade Manual
 The Snort Team
 
 Revision History
-Revision 3.1.58.0 2023-03-22 11:46:44 EDT TST
+Revision 3.1.59.0 2023-04-06 17:16:52 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index c07cd0e9aa1773dd3c11708d599f11188dd54676..b970489cfc981bfb0cd54fd7e2b49cc124eafd3f 100644 (file)
--- a/doc/user/snort_user.text
+++ b/doc/user/snort_user.text
@@ -8,7 +8,7 @@ Snort 3 User Manual
 The Snort Team
 
 Revision History
-Revision 3.1.58.0 2023-03-22 11:46:02 EDT TST
+Revision 3.1.59.0 2023-04-06 17:16:09 EDT TST
 
 ---------------------------------------------------------------------