Pull request #4934: build: generate and tag 3.9.6.0

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

Squashed commit of the following:

commit 1b21169577bb692a0c0ea99f1e58fbf5c6d679ca
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Mon Oct 6 12:46:18 2025 -0400

    build: generate and tag 3.9.6.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eb67a0c50913ff7fbda8f46b5372e7b4a16a98a..a65e5a49b7a68bc0062b93105de11c35c86e2192 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (snort CXX C)
 
 set (VERSION_MAJOR 3)
 set (VERSION_MINOR 9)
-set (VERSION_PATCH 5)
+set (VERSION_PATCH 6)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index 0579a0bbc28841782b53889447aa4a638d3fe62c..e8190cdbf50cd23ca249d3bd66d45ba0892637c4 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,36 @@
+2025-10-06: 3.9.6.0
+
+* actions: fix integer underflow in ips_actions pegcount aggregation
+* appid: add setUserDetectorDataItem lua detector API
+* appid: fixed crash in stats manager
+* appid: fix http content processing
+* appid: fixing loop inside nntp validate data
+* appid: retain the shadow traffic status after detector reload
+* appid: standardize variable types in user data map unit test
+* codecs: fix encode for pppoe and ppp
+* control: fix potential buffer overrun by properly checking return of vsnprintf.
+* dce_rpc: clear rule options before freeing the buffer
+* dce-rpc: proper proto-bits not set in DCE2_GetRpkt which causes assertion fail in u2 logger
+* dce_rpc: reassembling out of bounds packets
+* decoder: improved decoding fails error message on tracer
+* decompress: added check for mini_fat_persector to not to be zero
+* decompress: fixed VBA decompression unhandled mem alloc exception
+* file_api: file cache sharing to use ref count for file inspector
+* file_api: set file size when file size is middle and data flushed
+* flow: continue retrying when the retry processing is still pending
+* host_tracker: acquire lock on host tracker cache before read access of member variables
+* host_tracker: iterate over network protocol vectors with reverse iterators instead of while loop
+* http_inspect,pub_sub: provide an API in HttpEvent to find whether the HTTP response is using a supported encoding type.
+* log: use batched logger for all kinds of log messages in prod when log_buffer config enabled
+* main: add message when unable to set affinity
+* memory: combine main and first pkt thread memory stats; resolve race condition
+* module_manager: use std::move to improve performance when assigning string variables
+* pub_sub: add quic logging events
+* s7comm: added stream splitter abort checks
+* stream: do not clear a session on a rebuilt packet
+* stream_tcp: do not generate established event on RST if 3whs is not complete
+* trace: print n-tuple for other packet types with IP layer set
+
 2025-09-03: 3.9.5.0
 
 * appid: first packet API fixes for using asd instead of odp

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 5c5f850ab640da891e60ebeac5dd44e06be628ec..8b796cb54fa7a64e1d4d1010716c16f0b927b4d3 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.9.5.0 2025-09-03 21:10:35 EDT TST
+Revision 3.9.6.0 2025-10-06 12:42:39 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -1273,6 +1273,8 @@ Configuration:
   * bool output.verbose = false: be verbose (same as -v)
   * bool output.obfuscate = false: obfuscate the logged IP addresses
     (same as -O)
+  * bool output.log_buffered = false: enable buffered logging for all
+    output
   * bool output.wide_hex_dump = false: output 20 bytes per lines
     instead of 16 when dumping buffers
 
@@ -10683,6 +10685,8 @@ libraries see the Getting Started section of the manual.
     starting at link layer (same as -X)
   * int output.event_trace.max_data = 0: maximum amount of packet
     data to capture { 0:65535 }
+  * bool output.log_buffered = false: enable buffered logging for all
+    output
   * string output.logdir = .: where to put log files (same as -l)
   * bool output.obfuscate = false: obfuscate the logged IP addresses
     (same as -O)

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index b36a7487f68e06725d666d6e6030f8cd5131f47e..413e1d817306698688a8d7c5ac1a1ee545f2ac08 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.9.5.0 2025-09-03 21:11:29 EDT TST
+Revision 3.9.6.0 2025-10-06 12:43:33 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 500c554b7f155b96480d4322065c38ea70870cb1..f1926834ea1c8a88710f3f33e2c1e67113b35ee9 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.9.5.0 2025-09-03 21:10:53 EDT TST
+Revision 3.9.6.0 2025-10-06 12:42:57 EDT TST
 
 ---------------------------------------------------------------------