Pull request #3880: build: generate and tag 3.1.64.0

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

Squashed commit of the following:

commit 950ce7b6f66736e4cd1ff7d8d89be3b373cba6aa
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Thu Jun 15 21:33:29 2023 -0400

    build: generate and tag 3.1.64.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86bdcef30df3906f90d4bf2f5fcfe6b2d74214fa..d3fbf66e7eeaf7e9508bb1986e3d2523af08b063 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 63)
+set (VERSION_PATCH 64)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index e72735a5d2220347d8194baf4a82e459a0a2dac6..a30daab146b8d76a8f675b520c2a7e1a6c02b097 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,11 @@
+2023-06-15: 3.1.64.0
+
+* appid: always publish a change message after do not decrypt
+* detection: handle case when no rule tree node is found for a policy ID.
+* flow: introduced granular counters for idle_prunes
+* http_inspect: remove stream interface abstraction for http/1.1 flows
+* stream_ip: fix session counters in timeout and cleanup cases
+
 2023-06-01: 3.1.63.0
 
 * appid: changes logic in ssl pattern matching

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index fedfe29eed5a95d935ddfd0aa7b12e6545fa7781..39bd190fd846b4987e4b35ccd6073eb4cd0b9c0e 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.63.0 2023-06-01 16:02:55 EDT TST
+Revision 3.1.64.0 2023-06-15 21:19:24 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -5573,7 +5573,10 @@ Peg counts:
 
   * stream.flows: total sessions (sum)
   * stream.total_prunes: total sessions pruned (sum)
-  * stream.idle_prunes: sessions pruned due to timeout (sum)
+  * stream.idle_prunes_max_flows: sessions pruned due to pruning
+    timeout since max flows is reached (sum)
+  * stream.idle_prunes_proto_timeout: sessions pruned due to protocol
+    timeout (sum)
   * stream.excess_prunes: sessions pruned due to excess (sum)
   * stream.uni_prunes: uni sessions pruned (sum)
   * stream.memcap_prunes: sessions pruned due to memcap (sum)
@@ -12040,7 +12043,10 @@ libraries see the Getting Started section of the manual.
   * stream_icmp.released: icmp session trackers released (sum)
   * stream_icmp.sessions: total icmp sessions (sum)
   * stream_icmp.timeouts: icmp session timeouts (sum)
-  * stream.idle_prunes: sessions pruned due to timeout (sum)
+  * stream.idle_prunes_max_flows: sessions pruned due to pruning
+    timeout since max flows is reached (sum)
+  * stream.idle_prunes_proto_timeout: sessions pruned due to protocol
+    timeout (sum)
   * stream_ip.alerts: alerts generated (sum)
   * stream_ip.anomalies: anomalies detected (sum)
   * stream_ip.created: ip session trackers created (sum)

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index c8c86e1b1809dd6c6fa39eb02a854fb187e680f2..719fbbadd73d79ee76c1fb8028dc4c120d7e5d3e 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.63.0 2023-06-01 16:03:43 EDT TST
+Revision 3.1.64.0 2023-06-15 21:20:29 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index a63db29a983bec66ae6e2f6455ed2b889b133abe..badd0446006877f135e28151d4224646396d538b 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.63.0 2023-06-01 16:03:11 EDT TST
+Revision 3.1.64.0 2023-06-15 21:19:45 EDT TST
 
 ---------------------------------------------------------------------