Merge pull request #2201 in SNORT/snort3 from ~MIALTIZE/snort3:3_0_1_build_3 to master

Squashed commit of the following:

commit 0d7f7cbababa6687b1484ac28802dd3c9ece31a1
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed May 6 12:14:19 2020 -0400

    build: generate and tag 3.0.1 build 3

diff --git a/ChangeLog b/ChangeLog
index a8c90e86925ad41890192830fcebd0e69a108579..2e5a5c198d9979a0eae1bf20c2a405216b3d6c93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2020/05/06 - 3.0.1 build 3
+
+-- appid: Do not process retry packets but continue processing future packets in AppId
+-- appid: Extract metadata for tunneled HTTP session
+-- appid: Make unit tests multithread safe
+-- appid: On API call store new values and publish an event for them immediately
+-- appid: remove old http2 support
+-- appid: store appids for http traffic in http session
+-- appid: support for multi-stream http2 session
+-- appid: Update miscellaneous appid on first decrypted packet
+-- build: add support for ccache
+-- file_api: fix file stats
+-- file_api: mark processing of file complete after type detection if signature not enabled
+-- http2_inspect: add peg count to track max concurrent http2 file transfers
+-- http2_inspect: fix handling leftover data with padding
+-- http2_inspect: protect against unexpected eval calls
+-- http2_inspect: support stream multiplexing
+-- http2_inspect: update padding check only for header and data frames
+-- http_inspect: add support for http2 file processing
+-- json: add stream formatter helper
+-- managers: sort the inspector list in inspection policy using the instance name
+-- memory: expose memory_cap.h to plugins
+-- parameter: reject reals assigned to ints
+-- rna: Update dev notes to describe usage
+-- snort: add classtype, priority, and references to --dump-rule-meta output
+-- snort: convert --dump-rule-{meta,state,deps} to json format
+-- so rules: allow #fragments in references in so rule stubs
+-- stream: Fix for stream pegs dumping zero values into perf_monitor_base.csv
+
 2020/04/23 - 3.0.1 build 2
 
 -- appid: Change sessionAPI to accomodate stream_index

diff --git a/doc/snort_manual.html b/doc/snort_manual.html
index dc2402c5f5b720bd95766c85e19b3b9d75f1403f..c21d70608f0ac81cc8e559f7312efb67163fd577 100644 (file)
--- a/doc/snort_manual.html
+++ b/doc/snort_manual.html
@@ -782,7 +782,7 @@ asciidoc.install(2);
 <div class="literalblock">\r
 <div class="content">\r
 <pre><code> ,,_     -*&gt; Snort++ &lt;*-\r
-o"  )~   Version 3.0.1 (Build 2)\r
+o"  )~   Version 3.0.1 (Build 3)\r
  ''''    By Martin Roesch &amp; The Snort Team\r
          http://snort.org/contact#team\r
          Copyright (C) 2014-2020 Cisco and/or its affiliates. All rights reserved.\r
@@ -13347,7 +13347,7 @@ int <strong>gtp_inspect.trace.all</strong> = 0: enable traces in module { 0:255
 <div class="ulist"><ul>\r
 <li>\r
 <p>\r
-<strong>http2_inspect.flows</strong>: HTTP connections inspected (sum)\r
+<strong>http2_inspect.flows</strong>: HTTP/2 connections inspected (sum)\r
 </p>\r
 </li>\r
 <li>\r
@@ -13365,6 +13365,11 @@ int <strong>gtp_inspect.trace.all</strong> = 0: enable traces in module { 0:255
 <strong>http2_inspect.max_table_entries</strong>: maximum entries in an HTTP/2 dynamic table (max)\r
 </p>\r
 </li>\r
+<li>\r
+<p>\r
+<strong>http2_inspect.max_concurrent_files</strong>: maximum concurrent file transfers per HTTP/2 connection (max)\r
+</p>\r
+</li>\r
 </ul></div>\r
 </div>\r
 <div class="sect2">\r
@@ -31816,7 +31821,12 @@ interval <strong>wscale.~range</strong>: check if TCP window scale is in given r
 </li>\r
 <li>\r
 <p>\r
-<strong>http2_inspect.flows</strong>: HTTP connections inspected (sum)\r
+<strong>http2_inspect.flows</strong>: HTTP/2 connections inspected (sum)\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+<strong>http2_inspect.max_concurrent_files</strong>: maximum concurrent file transfers per HTTP/2 connection (max)\r
 </p>\r
 </li>\r
 <li>\r
@@ -39928,7 +39938,7 @@ Adding/removing stream_* inspectors if stream was already configured
 <div id="footer">\r
 <div id="footer-text">\r
 Last updated\r
- 2020-04-23 11:59:51 EDT\r
+ 2020-05-06 12:35:40 EDT\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/doc/snort_manual.pdf b/doc/snort_manual.pdf
index f0235ec0e62bad9863f6d4125ae5369a1fa1390a..cbc557c35f4d68913d79b98a1c44e35a0bac726c 100644 (file)
Binary files a/doc/snort_manual.pdf and b/doc/snort_manual.pdf differ

diff --git a/doc/snort_manual.text b/doc/snort_manual.text
index fa57ed50d75f9ae80a49e112acf6400c7ff3612a..f90e349b01369669b77d38a5ee3c3f336e4407b5 100644 (file)
--- a/doc/snort_manual.text
+++ b/doc/snort_manual.text
@@ -411,7 +411,7 @@ Table of Contents
 Snorty
 
  ,,_     -*> Snort++ <*-
-o"  )~   Version 3.0.1 (Build 2)
+o"  )~   Version 3.0.1 (Build 3)
  ''''    By Martin Roesch & The Snort Team
          http://snort.org/contact#team
          Copyright (C) 2014-2020 Cisco and/or its affiliates. All rights reserved.
@@ -8412,13 +8412,15 @@ Rules:
 
 Peg counts:
 
-  * http2_inspect.flows: HTTP connections inspected (sum)
+  * http2_inspect.flows: HTTP/2 connections inspected (sum)
   * http2_inspect.concurrent_sessions: total concurrent HTTP/2
     sessions (now)
   * http2_inspect.max_concurrent_sessions: maximum concurrent HTTP/2
     sessions (max)
   * http2_inspect.max_table_entries: maximum entries in an HTTP/2
     dynamic table (max)
+  * http2_inspect.max_concurrent_files: maximum concurrent file
+    transfers per HTTP/2 connection (max)
 
 
 9.24. http_inspect
@@ -17040,7 +17042,9 @@ these libraries see the Getting Started section of the manual.
   * host_tracker.service_finds: host service finds (sum)
   * http2_inspect.concurrent_sessions: total concurrent HTTP/2
     sessions (now)
-  * http2_inspect.flows: HTTP connections inspected (sum)
+  * http2_inspect.flows: HTTP/2 connections inspected (sum)
+  * http2_inspect.max_concurrent_files: maximum concurrent file
+    transfers per HTTP/2 connection (max)
   * http2_inspect.max_concurrent_sessions: maximum concurrent HTTP/2
     sessions (max)
   * http2_inspect.max_table_entries: maximum entries in an HTTP/2

diff --git a/src/main/build.h b/src/main/build.h
index ac84188a7927c4e427460b444d4ff41cd73d03aa..bc520a46bfaa706facb7dd7bc1304bb736992419 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -12,7 +12,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD_NUMBER 2
+#define BUILD_NUMBER 3
 
 #ifndef EXTRABUILD
 #define BUILD STRINGIFY_MX(BUILD_NUMBER)