From: Priyanka Bangalore Gurudev (prbg) <prbg@cisco.com>
Date: Mon, 11 Sep 2023 13:40:48 +0000 (+0000)
Subject: Pull request #3992: build: generate and tag 3.1.70.0
X-Git-Tag: 3.1.70.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c52b1bfda2ff8150bc7865c03ea8b11e509d99c0;p=thirdparty%2Fsnort3.git

Pull request #3992: build: generate and tag 3.1.70.0

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

Squashed commit of the following:

commit 3357a9d7fd060ef804b9fa5dbb4790709142fd11
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Sun Sep 10 14:47:26 2023 -0400

    build: generate and tag 3.1.70.0
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23b44555d..94f2dbcb9 100644
--- 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 69)
+set (VERSION_PATCH 70)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 
diff --git a/ChangeLog.md b/ChangeLog.md
index 266de84bd..e9b963554 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,12 @@
+2023-08-10: 3.1.70.0
+
+* appid: makes regex error more of a warning
+* detection: fix assert expression
+* helpers: improve hyperscan_search error message
+* host_cache: added segmented host cache
+* main: prevent reloading unprepared thread
+* search_engines: allow a snort config to be passed to find_all
+
 2023-08-27: 3.1.69.0
 
 * appid: mark ssl appid lookup successful if a service id is available
diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index ccda664f8..50b5db88c 100644
--- 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.69.0 2023-08-27 09:33:21 EDT TST
+Revision 3.1.70.0 2023-09-10 14:39:41 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -820,6 +820,8 @@ Configuration:
     shutdown; won’t dump by default
   * int host_cache.memcap = 8388608: maximum host cache size in bytes
     { 512:maxSZ }
+  * int host_cache.segments = 4: number of host cache segments. It
+    must be power of 2. { 1:32 }
 
 Commands:
 
@@ -834,6 +836,8 @@ Commands:
   * host_cache.delete_client(host_ip, id, service, version): delete
     client from host
   * host_cache.get_stats(): get current host cache usage and pegs
+  * host_cache.get_segment_stats(segment): get usage and pegs for
+    cache segment(s)
 
 Peg counts:
 
@@ -9551,6 +9555,8 @@ libraries see the Getting Started section of the manual.
     shutdown; won’t dump by default
   * int host_cache.memcap = 8388608: maximum host cache size in bytes
     { 512:maxSZ }
+  * int host_cache.segments = 4: number of host cache segments. It
+    must be power of 2. { 1:32 }
   * enum hosts[].frag_policy: defragmentation policy { first | linux
     | bsd | bsd_right | last | windows | solaris }
   * addr hosts[].ip = 0.0.0.0/32: hosts address / CIDR
@@ -15563,6 +15569,8 @@ alert is raised by the enhanced JavaScript normalizer.
   * host_cache.delete_client(host_ip, id, service, version): delete
     client from host
   * host_cache.get_stats(): get current host cache usage and pegs
+  * host_cache.get_segment_stats(segment): get usage and pegs for
+    cache segment(s)
   * network.set_policy(id): set the network policy for commands given
     the user policy id
   * packet_capture.enable(filter, group): dump raw packets
diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 1fcd66f2e..08c836c5f 100644
--- 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.69.0 2023-08-27 09:34:29 EDT TST
+Revision 3.1.70.0 2023-09-10 14:40:46 EDT TST
 
 ---------------------------------------------------------------------
 
diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 7c9166fca..4ff9bc5b9 100644
--- 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.69.0 2023-08-27 09:33:44 EDT TST
+Revision 3.1.70.0 2023-09-10 14:40:02 EDT TST
 
 ---------------------------------------------------------------------