Pull request #3858: build: generate and tag 3.1.62.0

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

Squashed commit of the following:

commit 67e8ebf226049ffa7e08ec6f6a74b121794120cd
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Sun May 21 12:12:26 2023 -0400

    build: generate and tag 3.1.62.0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aa50f15044e0579b140efd9a8ae03953376b459..dfc7da10db807b499bc377965d8cff53e84037c2 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 61)
+set (VERSION_PATCH 62)
 set (VERSION_SUBLEVEL 0)
 set (VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUBLEVEL}")
 

diff --git a/ChangeLog.md b/ChangeLog.md
index cc65270db7f3b89a06f10da1f768ea341c37c62b..e36f867a6e0d97eeb9bf9b56bef40ed32d43f42e 100644 (file)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,20 @@
+2023-05-21: 3.1.62.0
+
+* appid: added logic to check for encrypted appid before assigning SSL service based on port
+* decompress, detetion, file_api, framework: cppcheck fixes
+* flow: clean up flow termination
+* flow: do not recycle flow cache entries
+* http_inspect: add support for file transfer using Partial Content
+* main: disable watchdog when Snort 3 process exits gracefully
+* main, managers: set the network policy using the user id during inspector delete
+* memory: add extra jemalloc counts for tracking
+* memory: use jemalloc stats.mapped for process total
+* profiler: add json formatter
+* protocols: add check for missing Geneve layer in get_geneve_options.
+* protocols,codecs: decode Geneve variable length options.
+* sfip/test: fix a miscalculation of the number of codes entries.
+* snort2lua: remove 'reference' option during conversion
+
 2023-05-04: 3.1.61.0
 
 * appid: appIdPegCounters thread data handling refactored to prevent data races

diff --git a/doc/reference/snort_reference.text b/doc/reference/snort_reference.text
index 9ef3c64605a3c727790d4a0582c6b3af0853d96b..62fd22798026f61329f53e1809f3bdd0f8fdc109 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.61.0 2023-05-04 22:13:01 EDT TST
+Revision 3.1.62.0 2023-05-21 12:06:30 EDT TST
 
 ---------------------------------------------------------------------
 
@@ -1104,6 +1104,10 @@ Peg counts:
     memory while process over limit (now)
   * memory.reap_increase: total amount of the increase in thread
     memory while process over limit (now)
+  * memory.app_all: total bytes allocated by application (now)
+  * memory.active: total bytes allocated in active pages (now)
+  * memory.resident: maximum bytes physically resident (now)
+  * memory.retained: total bytes not returned to OS (now)
 
 
 2.20. network
@@ -1327,7 +1331,7 @@ Commands:
   * profiler.rule_start(): enable rule profiler
   * profiler.rule_stop(): disable rule profiler
   * profiler.rule_status(): print rule profiler status
-  * profiler.rule_dump(): print rule statistics
+  * profiler.rule_dump(output): print rule statistics
 
 
 2.27. rate_filter
@@ -5599,8 +5603,6 @@ Peg counts:
   * stream.reload_offloaded_deletes: number of offloaded flows
     deleted by config reloads (sum)
   * stream.current_flows: current number of flows in cache (now)
-  * stream.current_free_flows: current number of free flows in cache
-    (now)
   * stream.uni_flows: number of uni flows in cache (now)
   * stream.uni_ip_flows: number of uni ip flows in cache (now)
 
@@ -11667,8 +11669,10 @@ libraries see the Getting Started section of the manual.
   * latency.total_packets: total packets monitored (sum)
   * latency.total_rule_evals: total rule evals monitored (sum)
   * latency.total_usecs: total usecs elapsed (sum)
+  * memory.active: total bytes allocated in active pages (now)
   * memory.allocated: total amount of memory allocated by packet
     threads (now)
+  * memory.app_all: total bytes allocated by application (now)
   * memory.cur_in_use: current memory used (now)
   * memory.deallocated: total amount of memory deallocated by packet
     threads (now)
@@ -11684,6 +11688,8 @@ libraries see the Getting Started section of the manual.
   * memory.reap_failures: failures to reclaim memory (now)
   * memory.reap_increase: total amount of the increase in thread
     memory while process over limit (now)
+  * memory.resident: maximum bytes physically resident (now)
+  * memory.retained: total bytes not returned to OS (now)
   * memory.start_up_use: memory used before packet processing (now)
   * mem_test.packets: total packets (sum)
   * mms.concurrent_sessions: total concurrent MMS sessions (now)
@@ -12017,8 +12023,6 @@ libraries see the Getting Started section of the manual.
   * ssl.sessions_ignored: total sessions ignore (sum)
   * ssl.unrecognized_records: total unrecognized records (sum)
   * stream.current_flows: current number of flows in cache (now)
-  * stream.current_free_flows: current number of free flows in cache
-    (now)
   * stream.excess_prunes: sessions pruned due to excess (sum)
   * stream.expected_flows: total expected flows created within snort
     (sum)
@@ -15567,7 +15571,7 @@ alert is raised by the enhanced JavaScript normalizer.
   * profiler.rule_start(): enable rule profiler
   * profiler.rule_stop(): disable rule profiler
   * profiler.rule_status(): print rule profiler status
-  * profiler.rule_dump(): print rule statistics
+  * profiler.rule_dump(output): print rule statistics
   * 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

diff --git a/doc/upgrade/snort_upgrade.text b/doc/upgrade/snort_upgrade.text
index 2dd2792b51b1e38f896b3d4d79c4d78ab4815c37..a4615af92f82dea1abe95de645748e0c420997be 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.61.0 2023-05-04 22:14:07 EDT TST
+Revision 3.1.62.0 2023-05-21 12:07:36 EDT TST
 
 ---------------------------------------------------------------------
 

diff --git a/doc/user/snort_user.text b/doc/user/snort_user.text
index 4523752c56b20dfd260dd03c75651539616fd3ea..209eb7cf2185867ef57fca8835a07b1ad590d793 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.61.0 2023-05-04 22:13:23 EDT TST
+Revision 3.1.62.0 2023-05-21 12:06:51 EDT TST
 
 ---------------------------------------------------------------------