Pull request #3318: build: generate and tag 3.1.26.0

Merge in SNORT/snort3 from ~STECHEW/snort3:build_3.1.26.0 to master

Squashed commit of the following:

commit 7e37ddc2a37e5a77476634521664fa9c6c5af527
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Mar 23 12:52:10 2022 -0400

    build: generate and tag 3.1.26.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 156caa7bc6f07a673b10cbfe16208eb63f7394c2..1e80b12de39b97f3d43227e4af464d0065739b3a 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 25)
+set (VERSION_PATCH 26)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog b/ChangeLog
index 281b4e8809ea8ec9c8ee1f08f8bd8fbc9916cf0e..712e8d70d35f07a1b865605abe158ca59e4dcb25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2022/03/23 - 3.1.26.0
+
+actions: revert bf62a22d43bb2d15b7425c5ec3e3118ead470e8d
+actions: set a delayed action on Reject IPS Action hit
+analyzer: avoid distilling sticky verdicts
+appid: appid api to provide the path to appid detector directory
+appid: make appid a global inspector
+appid: sum stats at tterm and null the thread local stats pointer after delete
+control: make sure reload commands with empty argument is handled correctly
+event: add new static member update_and_get_event_id()
+file_api: Handling user_file_data cleanup
+flow: make service a shared pointer to handle reload properly
+framework: update base API version to 13
+http_inspect: do file decompression and utf decoding on non-MIME uploads
+http_inspect, mime: VBA macro decompression for HTTP MIME file uploads
+inspector, main, inspector_manager: add support for thread local data in inspectors and commands updating reload_id
+main: add the control connection to the analyzer command and a method to log a message to both console and the remote connection
+main: fix and reenable the distill_verdict unit test
+managers: add a faster get_inspectors method
+managers: add get_inspector unit tests
+managers: move inspection policies into the corresponding network policy
+packet_io: fix active action so the first reset occurred takes effect
+policy_selectors: add a method to select policies based on DAQ_FlowStats_t
+reputation: add a command to reload repuation data
+stream: reusable stream splitter
+
 2022/03/09 - 3.1.25.0
 
 appid: do not add duplicate process to client app mapping for the same process name

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 1c2500e2759751e0a5253aaa7e6b8427fe19fc16..417947e4528c4cd2fb0063c8d935da9db47c90b1 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.25.0 2022-03-09 06:31:14 EST TST
+Revision 3.1.26.0 2022-03-23 13:19:21 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -2438,9 +2438,9 @@ Help: application and service identification
 
 Type: inspector (control)
 
-Usage: context
+Usage: global
 
-Instance Type: network
+Instance Type: global
 
 Configuration:
 
@@ -2628,6 +2628,7 @@ Peg counts:
 
   * binder.raw_packets: raw packets evaluated (sum)
   * binder.new_flows: new flows evaluated (sum)
+  * binder.rebinds: flows rebound (sum)
   * binder.service_changes: flow service changes evaluated (sum)
   * binder.assistant_inspectors: flow assistant inspector requests
     handled (sum)
@@ -4835,6 +4836,10 @@ Configuration:
     allowlist { do_not_block|trust }
   * string reputation.allowlist: allowlist file name with IP lists
 
+Commands:
+
+  * reputation.reload(): reload reputation data
+
 Rules:
 
   * 136:1 (reputation) packets blocked based on source
@@ -10815,6 +10820,7 @@ these libraries see the Getting Started section of the manual.
   * binder.new_standby_flows: new HA flows evaluated (sum)
   * binder.no_match: binding evaluations that had no matches (sum)
   * binder.raw_packets: raw packets evaluated (sum)
+  * binder.rebinds: flows rebound (sum)
   * binder.resets: reset actions bound (sum)
   * binder.service_changes: flow service changes evaluated (sum)
   * cip.concurrent_sessions: total concurrent SIP sessions (now)
@@ -15190,6 +15196,7 @@ a reserved value
     host pairs
   * perf_monitor.show_flow_ip_profiling(): show status of statistics
     on host pairs
+  * reputation.reload(): reload reputation data
   * rna.dump_macs(): dump rna’s internal MAC trackers
   * rna.delete_mac_host(mac): delete a MAC from rna’s MAC cache
   * rna.delete_mac_host_proto(mac, proto): delete a protocol

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 83ff6fc27137d8e920c04a880ff60fd4a9fa519f..36c0b44c625c96c0e47bb818c52de7d996d72080 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.25.0 2022-03-09 06:31:00 EST TST
+Revision 3.1.26.0 2022-03-23 13:19:07 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index d112516ada61384276594462e72f2904cba63c8e..d3372ca50e39398116ec424a311847a39235f3e4 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.25.0 2022-03-09 06:31:00 EST TST
+Revision 3.1.26.0 2022-03-23 13:19:07 EDT TST
 
 ---------------------------------------------------------------------