From: Michael Altizer (mialtize) Date: Wed, 6 May 2020 17:17:48 +0000 (+0000) Subject: Merge pull request #2201 in SNORT/snort3 from ~MIALTIZE/snort3:3_0_1_build_3 to master X-Git-Tag: 3.0.1-3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58515b8ff348289021e6c0c34935b569a6c9f9de;p=thirdparty%2Fsnort3.git 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 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 a8c90e869..2e5a5c198 100644 --- 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 dc2402c5f..c21d70608 100644 --- a/doc/snort_manual.html +++ b/doc/snort_manual.html @@ -782,7 +782,7 @@ asciidoc.install(2); 
 ,,_     -*> 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.
@@ -13347,7 +13347,7 @@ int gtp_inspect.trace.all = 0: enable traces in module { 0:255
 
    
 
  • 
 
    
-http2_inspect.flows: HTTP connections inspected (sum)
+http2_inspect.flows: HTTP/2 connections inspected (sum)
 
    
 
    • 
 
  • 
@@ -13365,6 +13365,11 @@ int gtp_inspect.trace.all = 0: enable traces in module { 0:255
 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)
+
    
+
    •
@@ -31816,7 +31821,12 @@ interval wscale.~range: check if TCP window scale is in given r

  • -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)

  • @@ -39928,7 +39938,7 @@ Adding/removing stream_* inspectors if stream was already configured diff --git a/doc/snort_manual.pdf b/doc/snort_manual.pdf index f0235ec0e..cbc557c35 100644 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 fa57ed50d..f90e349b0 100644 --- 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 ac84188a7..bc520a46b 100644 --- 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)