Pull request #4418: build: generate and tag 3.3.3.0

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

Squashed commit of the following:

commit 8f9c6cc9c72e719f150cfeab8ea765c81864b756
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Tue Aug 13 00:25:59 2024 -0400

    build: generate and tag 3.3.3.0

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

diff --git a/ChangeLog.md b/ChangeLog.md
index bf14ec9750fa9710cbf8d25545cd2eb18a12a07f..fb933260fe3a7dda755ccb2259496e984d404807 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,20 @@
+2024-08-13: 3.3.3.0
+
+* control: code cleanup
+* control: handle control commands after packet threads are fully initialised
+* daq: add outstanding packets counter
+* extractor: add flow hash key
+* file_api: max depth is set as part of initial config
+* file: remove unused variable in FileFlows destructor
+* filters: update dev_notes.txt with details for event_filter
+* flow: optimize timeout handling for different packet type
+* http_inspect: add peg counts for gzip, known-not-supported, and unknown
+* http_inspect: log normalized URI in extra data
+* ips_options: separate main thread pcre counts from packet threads stats
+* memory: account memory for profiler only when packet thread is involved
+* src: resolve various warnings
+* stream_tcp: make sure ports are correctly swapped when filling a meta-ACK packet
+
 2024-07-29: 3.3.2.0
 
 * appid: fixing cpp warnings and cosmetic changes for appid cpu profiler

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index f9c6b64404d3f08a131e56de86d99cd237d8d371..332b43092107c22526f79d1ef992f5b5e19cd096 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.3.2.0 2024-07-29 22:04:21 EDT TST
+Revision 3.3.3.0 2024-08-13 00:18:44 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -4262,6 +4262,12 @@ Peg counts:
     (sum)
   * http_inspect.skip_mime_attach: total number of HTTP requests with
     too many MIME attachments to inspect (sum)
+  * http_inspect.compressed_gzip: total number of HTTP bodies
+    compressed with GZIP (sum)
+  * http_inspect.compressed_not_supported: total number of HTTP
+    bodies compressed with known but not supported methods (sum)
+  * http_inspect.compressed_unknown: total number of HTTP bodies
+    compressed with unknown methods (sum)
 
 
 5.27. iec104
@@ -8145,10 +8151,6 @@ Configuration:
 
 Peg counts:
 
-  * pcre.pcre_rules: total rules processed with pcre option (sum)
-  * pcre.pcre_to_hyper: total pcre rules by hyperscan engine (sum)
-  * pcre.pcre_native: total pcre rules compiled by pcre engine (sum)
-  * pcre.pcre_negated: total pcre rules using negation syntax (sum)
   * pcre.pcre_match_limit: total number of times pcre hit the match
     limit (sum)
   * pcre.pcre_recursion_limit: total number of times pcre hit the
@@ -11994,6 +11996,12 @@ libraries see the Getting Started section of the manual.
   * http2_inspect.total_bytes: total HTTP/2 data bytes inspected
     (sum)
   * http_inspect.chunked: chunked message bodies (sum)
+  * http_inspect.compressed_gzip: total number of HTTP bodies
+    compressed with GZIP (sum)
+  * http_inspect.compressed_not_supported: total number of HTTP
+    bodies compressed with known but not supported methods (sum)
+  * http_inspect.compressed_unknown: total number of HTTP bodies
+    compressed with unknown methods (sum)
   * http_inspect.concurrent_sessions: total concurrent http sessions
     (now)
   * http_inspect.connect_requests: CONNECT requests inspected (sum)
@@ -12268,12 +12276,8 @@ libraries see the Getting Started section of the manual.
   * pcre.pcre_error: total number of times pcre returns error (sum)
   * pcre.pcre_match_limit: total number of times pcre hit the match
     limit (sum)
-  * pcre.pcre_native: total pcre rules compiled by pcre engine (sum)
-  * pcre.pcre_negated: total pcre rules using negation syntax (sum)
   * pcre.pcre_recursion_limit: total number of times pcre hit the
     recursion limit (sum)
-  * pcre.pcre_rules: total rules processed with pcre option (sum)
-  * pcre.pcre_to_hyper: total pcre rules by hyperscan engine (sum)
   * perf_monitor.flow_tracker_creates: total number of flow trackers
     created (sum)
   * perf_monitor.flow_tracker_prunes: flow trackers pruned for reuse

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 58675a01b209a858556aff98155a7da4ebd3d066..e29dbcc8273db9c308c2f328dd8bfd51f7a0f73a 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.3.2.0 2024-07-29 22:05:11 EDT TST
+Revision 3.3.3.0 2024-08-13 00:19:20 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 38a9a6ff1a108d31c9126db2b254319be61402dd..d23e63b58d801539e9e1b8c21a9fcf20cc9cde55 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.3.2.0 2024-07-29 22:04:38 EDT TST
+Revision 3.3.3.0 2024-08-13 00:18:55 EDT TST
 
 ---------------------------------------------------------------------