Pull request #4428: build: generate and tag 3.3.4.0

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

Squashed commit of the following:

commit 745fb3e8c31cac674067037f4644198def469e50
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Mon Aug 26 23:17:35 2024 -0400

    build: generate and tag 3.3.4.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c8cfb19238af8438bf825469224d83aa3410f32..4e4fb400c0ae670f8dcc0a88f97b67b4c31262be 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 3)
+set (VERSION_PATCH 4)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index fb933260fe3a7dda755ccb2259496e984d404807..ddc97e5b4e7837a60dc09cd527c439d0b6365256 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,11 @@
+2024-08-26: 3.3.4.0
+
+* appid: notify binder on service change
+* appid: replaced hsessions vector of raw pointers into vector of smart pointers
+* ftp_telnet: refactoring ftp-data
+* latency, dce, stream_ip: fix max pegs incorrectly declared sum
+* telnet: avoid flush when cr or lf is between commands
+
 2024-08-13: 3.3.3.0
 
 * control: code cleanup

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 332b43092107c22526f79d1ef992f5b5e19cd096..4a5fb9470e3f396b68c6bae5ae3096e7007a73f9 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.3.0 2024-08-13 00:18:44 EDT TST
+Revision 3.3.4.0 2024-08-26 22:57:24 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -1104,7 +1104,7 @@ Peg counts:
 
   * latency.total_packets: total packets monitored (sum)
   * latency.total_usecs: total usecs elapsed (sum)
-  * latency.max_usecs: maximum usecs elapsed (sum)
+  * latency.max_usecs: maximum usecs elapsed (max)
   * latency.packet_timeouts: packets that timed out (sum)
   * latency.total_rule_evals: total rule evals monitored (sum)
   * latency.rule_eval_timeouts: rule evals that timed out (sum)
@@ -2784,7 +2784,7 @@ Configuration:
   * string binder[].when.tenants: list of tenants
   * enum binder[].when.role = any: use the given configuration on one
     or any end of a session { client | server | any }
-  * string binder[].when.service: override default configuration
+  * string binder[].when.service: space separated list of services
   * enum binder[].use.action = inspect: what to do with matching
     traffic { reset | block | allow | inspect }
   * string binder[].use.file: use configuration in given file
@@ -3038,7 +3038,7 @@ Peg counts:
   * dce_smb.cache_misses: smbv2 cache did not find entry (sum)
   * dce_smb.cache_replaces: smbv2 cache found entry and replaced its
     value (sum)
-  * dce_smb.cache_max: smbv2 cache’s maximum byte usage (sum)
+  * dce_smb.cache_max: smbv2 cache’s maximum byte usage (max)
   * dce_smb.cache_prunes: smbv2 cache pruned entry to make space for
     new entry (sum)
   * dce_smb.cache_removes: smbv2 cache removed existing entry (sum)
@@ -3070,7 +3070,7 @@ Peg counts:
   * dce_smb.response_fragments: total connection-oriented response
     fragments (sum)
   * dce_smb.client_max_fragment_size: connection-oriented client
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_smb.client_min_fragment_size: connection-oriented client
     minimum fragment size (sum)
   * dce_smb.client_segs_reassembled: total connection-oriented client
@@ -3078,7 +3078,7 @@ Peg counts:
   * dce_smb.client_frags_reassembled: total connection-oriented
     client fragments reassembled (sum)
   * dce_smb.server_max_fragment_size: connection-oriented server
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_smb.server_min_fragment_size: connection-oriented server
     minimum fragment size (sum)
   * dce_smb.server_segs_reassembled: total connection-oriented server
@@ -3318,7 +3318,7 @@ Peg counts:
   * dce_tcp.response_fragments: total connection-oriented response
     fragments (sum)
   * dce_tcp.client_max_fragment_size: connection-oriented client
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_tcp.client_min_fragment_size: connection-oriented client
     minimum fragment size (sum)
   * dce_tcp.client_segs_reassembled: total connection-oriented client
@@ -3326,7 +3326,7 @@ Peg counts:
   * dce_tcp.client_frags_reassembled: total connection-oriented
     client fragments reassembled (sum)
   * dce_tcp.server_max_fragment_size: connection-oriented server
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_tcp.server_min_fragment_size: connection-oriented server
     minimum fragment size (sum)
   * dce_tcp.server_segs_reassembled: total connection-oriented server
@@ -3396,7 +3396,7 @@ Peg counts:
     (sum)
   * dce_udp.fragments: total connection-less fragments (sum)
   * dce_udp.max_fragment_size: connection-less maximum fragment size
-    (sum)
+    (max)
   * dce_udp.frags_reassembled: total connection-less fragments
     reassembled (sum)
   * dce_udp.max_seqnum: max connection-less seqnum (sum)
@@ -4582,7 +4582,7 @@ Peg counts:
   * netflow.cache_misses: netflow cache did not find entry (sum)
   * netflow.cache_replaces: netflow cache found entry and replaced
     its value (sum)
-  * netflow.cache_max: netflow cache’s maximum byte usage (sum)
+  * netflow.cache_max: netflow cache’s maximum byte usage (max)
   * netflow.cache_prunes: netflow cache pruned entry to make space
     for new entry (sum)
   * netflow.cache_removes: netflow cache removed existing entry (sum)
@@ -5950,7 +5950,7 @@ Peg counts:
   * stream_ip.total_bytes: total number of bytes processed (sum)
   * stream_ip.total_frags: total fragments (sum)
   * stream_ip.current_frags: current fragments (now)
-  * stream_ip.max_frags: max fragments (sum)
+  * stream_ip.max_frags: max fragments (max)
   * stream_ip.reassembled: reassembled datagrams (sum)
   * stream_ip.discards: fragments discarded (sum)
   * stream_ip.frag_timeouts: datagrams abandoned (sum)
@@ -9473,7 +9473,7 @@ libraries see the Getting Started section of the manual.
     | user | file }
   * enum binder[].when.role = any: use the given configuration on one
     or any end of a session { client | server | any }
-  * string binder[].when.service: override default configuration
+  * string binder[].when.service: space separated list of services
   * string binder[].when.src_groups: list of source interface group
     IDs
   * string binder[].when.src_intfs: list of source interface IDs
@@ -11551,7 +11551,7 @@ libraries see the Getting Started section of the manual.
   * dce_smb.binds: total connection-oriented binds (sum)
   * dce_smb.cache_adds: smbv2 cache added new entry (sum)
   * dce_smb.cache_hits: smbv2 cache found existing entry (sum)
-  * dce_smb.cache_max: smbv2 cache’s maximum byte usage (sum)
+  * dce_smb.cache_max: smbv2 cache’s maximum byte usage (max)
   * dce_smb.cache_misses: smbv2 cache did not find entry (sum)
   * dce_smb.cache_prunes: smbv2 cache pruned entry to make space for
     new entry (sum)
@@ -11562,7 +11562,7 @@ libraries see the Getting Started section of the manual.
   * dce_smb.client_frags_reassembled: total connection-oriented
     client fragments reassembled (sum)
   * dce_smb.client_max_fragment_size: connection-oriented client
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_smb.client_min_fragment_size: connection-oriented client
     minimum fragment size (sum)
   * dce_smb.client_segs_reassembled: total connection-oriented client
@@ -11595,7 +11595,7 @@ libraries see the Getting Started section of the manual.
   * dce_smb.server_frags_reassembled: total connection-oriented
     server fragments reassembled (sum)
   * dce_smb.server_max_fragment_size: connection-oriented server
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_smb.server_min_fragment_size: connection-oriented server
     minimum fragment size (sum)
   * dce_smb.server_segs_reassembled: total connection-oriented server
@@ -11748,7 +11748,7 @@ libraries see the Getting Started section of the manual.
   * dce_tcp.client_frags_reassembled: total connection-oriented
     client fragments reassembled (sum)
   * dce_tcp.client_max_fragment_size: connection-oriented client
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_tcp.client_min_fragment_size: connection-oriented client
     minimum fragment size (sum)
   * dce_tcp.client_segs_reassembled: total connection-oriented client
@@ -11776,7 +11776,7 @@ libraries see the Getting Started section of the manual.
   * dce_tcp.server_frags_reassembled: total connection-oriented
     server fragments reassembled (sum)
   * dce_tcp.server_max_fragment_size: connection-oriented server
-    maximum fragment size (sum)
+    maximum fragment size (max)
   * dce_tcp.server_min_fragment_size: connection-oriented server
     minimum fragment size (sum)
   * dce_tcp.server_segs_reassembled: total connection-oriented server
@@ -11801,7 +11801,7 @@ libraries see the Getting Started section of the manual.
   * dce_udp.max_concurrent_sessions: maximum concurrent sessions
     (max)
   * dce_udp.max_fragment_size: connection-less maximum fragment size
-    (sum)
+    (max)
   * dce_udp.max_seqnum: max connection-less seqnum (sum)
   * dce_udp.no_calls: total connection-less no calls (sum)
   * dce_udp.other_requests: total connection-less other requests
@@ -12113,7 +12113,7 @@ libraries see the Getting Started section of the manual.
     limit overflows (sum)
   * js_norm.identifiers: total number of unique identifiers processed
     (sum)
-  * latency.max_usecs: maximum usecs elapsed (sum)
+  * latency.max_usecs: maximum usecs elapsed (max)
   * latency.packet_timeouts: packets that timed out (sum)
   * latency.rule_eval_timeouts: rule evals that timed out (sum)
   * latency.rule_tree_enables: rule tree re-enables (sum)
@@ -12159,7 +12159,7 @@ libraries see the Getting Started section of the manual.
   * modbus.sessions: total sessions processed (sum)
   * netflow.cache_adds: netflow cache added new entry (sum)
   * netflow.cache_hits: netflow cache found existing entry (sum)
-  * netflow.cache_max: netflow cache’s maximum byte usage (sum)
+  * netflow.cache_max: netflow cache’s maximum byte usage (max)
   * netflow.cache_misses: netflow cache did not find entry (sum)
   * netflow.cache_prunes: netflow cache pruned entry to make space
     for new entry (sum)
@@ -12526,7 +12526,7 @@ libraries see the Getting Started section of the manual.
   * stream_ip.drops: fragments dropped (sum)
   * stream_ip.fragmented_bytes: total fragmented bytes (sum)
   * stream_ip.frag_timeouts: datagrams abandoned (sum)
-  * stream_ip.max_frags: max fragments (sum)
+  * stream_ip.max_frags: max fragments (max)
   * stream_ip.max: max ip sessions (max)
   * stream.ip_memcap_prunes: number of IP flows pruned due to memcap
     (sum)

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index e29dbcc8273db9c308c2f328dd8bfd51f7a0f73a..ec9761038eac976348a02b503f9f12655057b785 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.3.0 2024-08-13 00:19:20 EDT TST
+Revision 3.3.4.0 2024-08-26 22:58:03 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index d23e63b58d801539e9e1b8c21a9fcf20cc9cde55..16c93eb60a1ff967813f1e77b1978f84993de063 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.3.0 2024-08-13 00:18:55 EDT TST
+Revision 3.3.4.0 2024-08-26 22:57:37 EDT TST
 
 ---------------------------------------------------------------------