Merge pull request #2723 in SNORT/snort3 from ~MDAGON/snort3:napth to master

Squashed commit of the following:

commit 3043fc34dfe875a1362407c007dfc5c07d80ae4e
Author: mdagon <mdagon@cisco.com>
Date:   Tue Jan 26 15:59:22 2021 -0500

    codecs: update tcp naptha check to make sure it is ipv4 traffic

Merge pull request #2695 in SNORT/snort3 from ~SHIKV/snort3:snmp to master

Squashed commit of the following:

commit 35e3bfc98489be91544c74e671fc2eb31c7c4dc4
Author: shikv <shikv@cisco.com>
Date:   Sun Jan 10 16:57:40 2021 -0500

    appid: add support for snmpv3 report pdu

Merge pull request #2719 in SNORT/snort3 from ~DIPANDIT/snort3:handle_stop_verdict to master

Squashed commit of the following:

commit 7d259f788d761da3eacb91122e54d52c3e0ac4e3
Author: Dipto Pandit <dipandit@cisco.com>
Date:   Mon Jan 25 04:29:18 2021 -0500

    file_api: stop processing signature when type verdict is 'FILE_VERDICT_STOP'

Merge pull request #2693 in SNORT/snort3 from ~SMINUT/snort3:host_cache_rna to master

Squashed commit of the following:

commit ec7f9504910ba29d2899c7669f833195b29fd6dd
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Jan 8 10:55:59 2021 -0500

    rna: Minimize synchronization overhead

    Avoid some locks during network discovery in order to increase speed,
    by caching the host trackers locally in the RNAFlow, in a way in which
    the cached host trackers do not spill memory into the host cache during
    pruning.

Merge pull request #2700 in SNORT/snort3 from ~SHRARANG/snort3:appid_lua_cleanup to master

Squashed commit of the following:

commit b99a830b4eaefa3394534da367df1f1fcd6aed10
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Mon Jan 11 10:52:37 2021 -0500

    appid: remove unused code; cleanup FIXIT comments related to reload

Merge pull request #2713 in SNORT/snort3 from ~SATHIRKA/snort3:reload_response to master

Squashed commit of the following:

commit ab0f7d9e35572f611a339eb4ff7ddeeeb8b3c547
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Fri Jan 8 11:19:29 2021 -0500

    appid: Send reload detectors and third-party messages to socket immediately if appid is not enabled

Merge pull request #2717 in SNORT/snort3 from ~KATHARVE/snort3:hi_scheme_length to master

Squashed commit of the following:

commit 3ba32d1935436a4246e8242302935abb38a92c13
Author: Katura Harvey <katharve@cisco.com>
Date:   Fri Jan 22 10:53:37 2021 -0500

    http_inspect: validate URI scheme length

Merge pull request #2681 in SNORT/snort3 from ~PRBHALER/snort3:fw_ha to master

Squashed commit of the following:

commit 8947b45af8169786b9b46a8f6139e3532abcde20
Author: Pranav Bhalerao <prbhaler@cisco.com>
Date:   Mon Jan 18 10:17:47 2021 -0500

    flow: updating direction and interface info in HA flow.

Merge pull request #2689 in SNORT/snort3 from ~SBAIGAL/snort3:ftps_eof to master

Squashed commit of the following:

commit bf862aa1e46a75147da1332d0f343faed2b273d6
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Tue Dec 15 13:09:53 2020 -0500

    ftp: using hold_packet to handle ftp-data eof

Merge pull request #2703 in SNORT/snort3 from ~SHRARANG/snort3:appid_sip_reload to master

Squashed commit of the following:

commit 14adfff5e37a683b77cc1426edf78c37bdbc2897
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Fri Jan 15 00:03:42 2021 -0500

    appid: do not process sip event for an existing session after detector reload

Merge pull request #2711 in SNORT/snort3 from ~OSHUMEIK/snort3:fix to master

Squashed commit of the following:

commit 46d8bcdb2067c1c169de3e4666bac9c2804a62f6
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Wed Jan 20 13:44:33 2021 +0200

    managers: change the message to be a warning

Merge pull request #2712 in SNORT/snort3 from ~RDEMPSTE/snort3:inspector_ref_count to master

Squashed commit of the following:

commit 8787270d1f835699059f2b6163435b222d076088
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Fri Jan 15 14:40:08 2021 -0500

    inspector: add a global reference count for uses that are not thread specific

Merge pull request #2709 in SNORT/snort3 from ~MDAGON/snort3:settings to master

Squashed commit of the following:

commit 40fdd7a388e51d4d2c8cdac04b79178989a6dea4
Author: mdagon <mdagon@cisco.com>
Date:   Tue Jan 12 16:57:13 2021 -0500

    payload_injector: inject settings frame

Merge pull request #2714 in SNORT/snort3 from ~THOPETER/snort3:nhttp152 to master

Squashed commit of the following:

commit d183c08a43839b51274b9323e808b05b14470177
Author: Tom Peters <thopeter@cisco.com>
Date:   Wed Jan 20 17:15:56 2021 -0500

    http_inspect: add chunked processing to dev notes

Merge pull request #2710 in SNORT/snort3 from ~SATHIRKA/snort3:ha_crash_appid to master

Squashed commit of the following:

commit 94e65ca756857fbe3e2a8940c12e813e033a62b2
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Fri Jan 15 09:28:39 2021 -0500

    appid: always store container session api object in stash

Merge pull request #2704 in SNORT/snort3 from ~ANTOROZC/snort3:opoluian_cert_cache_size to master

Squashed commit of the following:

commit be2fccccd8674196c0454f70b749534bdc150c0e
Author: Oleh Poluianskyi <opoluian@cisco.com>
Date:   Thu Jan 14 19:32:19 2021 +0200

    lrucache: changes for memcap for support constant cache objects with variable size.

Merge pull request #2686 in SNORT/snort3 from ~OSHUMEIK/snort3:purge_trash to master

Squashed commit of the following:

commit 6946763e813ab16584b977647cf8c3b7fce5e434
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Tue Dec 22 13:42:38 2020 +0200

    managers: clean all inactive inspectors ignoring referenced ones

    At the exit the framework guarantees all inactive inspectors will be cleaned up.

Merge pull request #2705 in SNORT/snort3 from ~KATHARVE/snort3:file_context to master

Squashed commit of the following:

commit 43e965a50c52225c8abf584a511f75db6923b00b
Author: Katura Harvey <katharve@cisco.com>
Date:   Thu Jan 14 15:55:38 2021 -0500

    mime: provide file_id to set file name and read new return value

commit e6de4fd92c3ce02a905aa18ed095d80e847413c9
Author: Katura Harvey <katharve@cisco.com>
Date:   Thu Jan 14 15:55:04 2021 -0500

    http_inspect: provide file_id to set file name and read new return value

commit 1197b3c8a80b2703a739704e11aeb4032e76ef90
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Jan 12 17:25:06 2021 -0500

    file_api: remove file context after file name set if processing is complete

Merge pull request #2701 in SNORT/snort3 from ~THOPETER/snort3:nhttp151 to master

Squashed commit of the following:

commit 590e02e4b68adfb5105de46c844b31c8cf3aaac5
Author: Tom Peters <thopeter@cisco.com>
Date:   Mon Jan 11 18:49:18 2021 -0500

    http_inspect: validate and normalize scheme

Merge pull request #2699 in SNORT/snort3 from ~MIALTIZE/snort3:version to master

Squashed commit of the following:

commit fde481c81ff3499cd9b5cf8f18557a4801378021
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Jan 13 12:57:23 2021 -0500

    build: Generate and tag 3.1.0

commit d8ba67eba1dac5e7e6ef19b02d252c4f1f6985f4
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Jan 13 12:57:23 2021 -0500

    build: Add support for version sublevel and build via CMake

    The sublevel version in CMakeLists.txt acts as a fourth digit for the
    version.  It is expected to be 0 in the master branch in all but the
    rarest cases.

    The VERSION_BUILD CMake variable can be defined and used by an external
    build system for artifact tracking.  If a build number is not manually
    defined, all mention of build numbers will be stripped from Snort's
    output.  To set VERSION_BUILD from configure_cmake.sh, the
    SNORT_BUILD_NUMBER variable is used from the command line options.

    Note: A build number of 0 will be ignored and treated as though it was
    not set.

commit 8dff1244a18d88b2f2f3da7241f335d7f97159ed
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Jan 13 12:57:23 2021 -0500

    stream_tcp: Remove obsolete flush_data_ready() function

Merge pull request #2691 in SNORT/snort3 from ~KBHANDAN/snort3:whd_ids to master

Squashed commit of the following:

commit c3914b6900a5570dd7eb87806da9749560971605
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Thu Jan 7 17:00:08 2021 -0500

    packet_io: ids mode should not give blacklist verdict for Intrusion event

Merge pull request #2682 in SNORT/snort3 from ~OSHUMEIK/snort3:log_buffered to master

Squashed commit of the following:

commit 640bdaa5a20b77c4ba8db4d571f1a7e9a52a48b9
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Wed Dec 16 17:54:34 2020 +0200

    log: reuse TextLog buffer for a large data

    Thanks to Chris White for reporting the issue.

Merge pull request #2688 in SNORT/snort3 from ~SATHIRKA/snort3:navl_conn_destroy_core to master

Squashed commit of the following:

commit 8f96caf9be67da55952502cee1e0822a72ec64c9
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Wed Jan 6 10:40:59 2021 -0500

    appid: tear down third-party when appid gets disabled

Merge pull request #2697 in SNORT/snort3 from ~KATHARVE/snort3:hi_fix_test to master

Squashed commit of the following:

commit 0d0f2b28cd6f25b3ad851cfd2538a5c7f487ad34
Author: Katura Harvey <katharve@cisco.com>
Date:   Mon Jan 11 13:01:08 2021 -0500

    http_inspect: fix type of unit test mock function

Merge pull request #2692 in SNORT/snort3 from ~MDAGON/snort3:nhi_alert to master

Squashed commit of the following:

commit 45db5f4a4e9eadc2ddb6565824ed3407063b4307
Author: mdagon <mdagon@cisco.com>
Date:   Tue Dec 22 15:44:07 2020 -0500

    http_inspect: alert on truncated chunked and content-length message bodies

Merge pull request #2690 in SNORT/snort3 from ~KATHARVE/snort3:h2_in_hi to master

Squashed commit of the following:

commit 955281029abbb6d30732b10660a5edde2594f78a
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Jan 5 14:59:13 2021 -0500

    http_inspect: abort on HTTP/2 connection preface

Merge pull request #2684 in SNORT/snort3 from ~ARMANDAV/snort3:rnafilter to master

Squashed commit of the following:

commit f4e3ff89854a11ff6d1cf3acd9bb7f99c2445314
Author: Arun Mandava <armandav@cisco.com>
Date:   Tue Dec 22 15:49:13 2020 -0500

    rna: Perform appropriate filter check based on the event type

Merge pull request #2687 in SNORT/snort3 from ~SHRARANG/snort3:appid_test_cleanup to master

Squashed commit of the following:

commit 4110a15eb824ce2ef4b4535ce7dae21ed831931b
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Sat Jan 2 06:50:48 2021 -0500

    appid: store stats in map

Merge pull request #2683 in SNORT/snort3 from ~PSREENAT/snort3:http_bytes_telemetry to master

Squashed commit of the following:

commit c52d4abbe0dc3a0256504ed7b66f6c22eba9af2b
Author: Prajwal Srinivas Sreenath <psreenat@cisco.com>
Date:   Tue Dec 22 00:03:57 2020 -0500

    http_inspect: added total_bytes peg to track HTTP data bytes inspected
    http2_inspect: added total_bytes peg to track HTTP/2 data bytes inspected

Merge pull request #2669 in SNORT/snort3 from ~DAVMCPHE/snort3:max_pdu_only to master

Squashed commit of the following:

commit c3b1baf2fd09a5aaf58ee09a26efd7048c8d3ea9
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Dec 22 11:30:01 2020 -0500

    stream_tcp: delete redundant calls to check if the tcp packet contains a data payload

commit ed0484fe30ec0e9fbd7808aaab06dbdbc8d61a75
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Dec 22 11:28:56 2020 -0500

     stream_tcp: on midstream pickup, when first packet is a data segment, set flag on talker tracker to reinit seglist base seg on first received data packet

commit c2d0eadde2b5eee60372c891b931bc39f626fc4f
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Dec 1 16:51:47 2020 -0500

    stream_tcp: fix issues causing overrun of the pdu reassembly buffer.  make splitters authoritative of size of the reassembled pdu

    rpc_decode: implement adjust_to_fit for RPC splitter

Merge pull request #2685 in SNORT/snort3 from ~VKAMBALA/snort3:vkambala to master

Squashed commit of the following:

commit 76711cb440bcab2b58522e661f99762d22b05b38
Author: krishnakanth <vkambala@cisco.com>
Date:   Tue Dec 22 01:10:13 2020 -0500

    dce_rpc: Handling Flow from File inspection

Merge pull request #2680 in SNORT/snort3 from ~MDAGON/snort3:stretch2 to master

Squashed commit of the following:

commit 2612410ad696c131fdb4218657cf4c0452c375b4
Author: mdagon <mdagon@cisco.com>
Date:   Wed Dec 16 08:57:08 2020 -0500

    http_inspect: support stretch for Http2

Merge pull request #2679 in SNORT/snort3 from ~MMATIRKO/snort3:hc_stats to master

Squashed commit of the following:

commit edff674d34c782734c05856c288423ba9ac448e4
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Thu Dec 17 18:31:36 2020 -0500

    host_cache: add command to output host_cache usage, pegs, and memcap

Merge pull request #2677 in SNORT/snort3 from ~ARMANDAV/snort3:revertperffix to master

Squashed commit of the following:

commit f75ee339e475c3a8c67a66f200f3c666eaf8a346
Author: Arun Mandava <armandav@cisco.com>
Date:   Thu Dec 17 23:20:40 2020 -0500

    rna: Fix version, vendor and user string comparison at maximum length

commit 55d146d81e50c91b372b3545fc5af399901f3b39
Author: Arun Mandava <armandav@cisco.com>
Date:   Thu Dec 17 18:58:06 2020 -0500

    rna: Revert rna performance optimizations

Merge pull request #2676 in SNORT/snort3 from ~MIALTIZE/snort3:3_0_3_build_6 to master

Squashed commit of the following:

commit e6ef79fc5f08a0dd29383e846527615e91ec85ea
Author: Michael Altizer <mialtize@cisco.com>
Date:   Sun Dec 20 13:33:56 2020 -0500

    build: Generate and tag 3.0.3 build 6

Merge pull request #2665 in SNORT/snort3 from ~KAMURTHI/snort3:interactive_block to master

Squashed commit of the following:

commit 66f73911e305ece27134da3d24a6c326dc3da5ea
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Tue Dec 8 17:29:07 2020 -0500

    appid: allow checking appid availability for a given http/2 stream

Merge pull request #2673 in SNORT/snort3 from ~SBAIGAL/snort3:ha_leak to master

Squashed commit of the following:

commit 346acd5e8b316701a2f5b7e98ff780bd6e68a095
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Wed Dec 16 16:00:06 2020 -0500

    reload_config: fix memory leak casued by incorrect code merge

Merge pull request #2672 in SNORT/snort3 from ~OSERHIIE/snort3:bug_CSCvw81752 to master

Squashed commit of the following:

commit 396f8663f2fb7cc95a318675dc0f961abf1ca2d6
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Wed Dec 16 13:52:00 2020 +0200

    parser: fix escape logic for --dump-rule-meta output

Merge pull request #2674 in SNORT/snort3 from ~SMINUT/snort3:rna_misc to master

Squashed commit of the following:

commit 284465093b36806f241318cd9e68ac8be2b03f89
Author: Silviu Minut <sminut@cisco.com>
Date:   Wed Dec 16 18:14:42 2020 -0500

    rna:
    * do null check on the RnaInspector rather than the RnaModule in the control commands
    * make the mac cache persist over reload config

Merge pull request #2675 in SNORT/snort3 from ~DERAMADA/snort3:revert_reputation to master

Squashed commit of the following:

commit e9c62d807056426a8702607b7c10bed407f624da
Author: Deepak Ramadass <deramada@cisco.com>
Date:   Thu Dec 17 10:26:37 2020 -0500

    reputation: retain backward compatibility

    This reverts commit 29c66e6d5d11a680633b1d8ac6f00b8c1c8e98d2.

Merge pull request #2659 in SNORT/snort3 from ~DERAMADA/snort3:reputation_cleanup to master

Squashed commit of the following:

commit bc3c243b24e39ca16a5f80c127dcd670a9bd3a00
Author: Deepak Ramadass <deramada@cisco.com>
Date:   Mon Dec 7 15:32:05 2020 -0500

    reputation: remove redundant terms

Merge pull request #2660 in SNORT/snort3 from ~KBHANDAN/snort3:whd to master

Squashed commit of the following:

commit 32eb1b6bf8f56b10a1f3de6fc57ac2f4bf96e415
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Wed Dec 9 12:28:38 2020 -0500

    flow: Pause logging during timeout processing

Merge pull request #2667 in SNORT/snort3 from ~THOPETER/snort3:h2i19 to master

Squashed commit of the following:

commit ec134c29fde5e04d049e59c04363b0244abc8aec
Author: Tom Peters <thopeter@cisco.com>
Date:   Tue Dec 1 12:39:37 2020 -0500

    http_inspect: script detection for HTTP/2

Merge pull request #2671 in SNORT/snort3 from ~THOPETER/snort3:h2i_extra_zero_fix to master

Squashed commit of the following:

commit 1478154ce4eb86a0c526ed6a16a7319e596c64d3
Author: mdagon <mdagon@cisco.com>
Date:   Wed Nov 25 11:45:43 2020 -0500

    http2_inspect: remove 0 length scan for most cases

Merge pull request #2654 in SNORT/snort3 from ~KATHARVE/snort3:http_mem to master

Squashed commit of the following:

commit 1d1ae0a0c472fd241db960b3463c451271d5bdd5
Author: Katura Harvey <katharve@cisco.com>
Date:   Thu Dec 3 12:34:01 2020 -0500

    http_inspect: explicit memory allocation for transactions and partial inspections

Merge pull request #2646 in SNORT/snort3 from ~OSERHIIE/snort3:bug_CSCvw42309 to master

Squashed commit of the following:

commit 35252f9f1f00e0d9a637ff3c39374d1c1b9c37e7
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Mon Nov 30 11:46:59 2020 +0200

    parser: add escaping for double quotes and special chars in a rule body

Merge pull request #2666 in SNORT/snort3 from ~KATHARVE/snort3:h2i_inspection_depth2 to master

Squashed commit of the following:

commit 0ac7d7a247071936d351a9b514d7aa240ad9386b
Author: Katura Harvey <katharve@cisco.com>
Date:   Thu Dec 10 16:36:19 2020 -0500

    http2_inspect: fix bug with exceeding inspection depth

Merge pull request #2663 in SNORT/snort3 from ~DIPANDIT/snort3:file_stat to master

Squashed commit of the following:

commit 55bed1f3cba5e8cdedc29e044bb1d802618aaa62
Author: Dipto Pandit <dipandit@cisco.com>
Date:   Thu Dec 10 05:31:04 2020 -0500

    file_api: fixed stats which weren't cleared when there were no stats for signature processing

Merge pull request #2656 in SNORT/snort3 from ~KAMURTHI/snort3:ha_appid to master

Squashed commit of the following:

commit 040522d0063caca6466e808eeeb0bbd44a9e277e
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Sun Nov 15 11:58:35 2020 -0500

    appid: add support for apps, http host, url and tls host in HA

Merge pull request #2657 in SNORT/snort3 from ~SATHIRKA/snort3:dhcp_fp_unified to master

Squashed commit of the following:

commit d37742db24cf3a3aae8e30d0df0a310347911d97
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Thu Dec 3 12:58:16 2020 -0500

    rna: Use service ip and port provided by appid for DHCP discovery events

Merge pull request #2645 in SNORT/snort3 from ~NEHASH4/snort3:key_mismatch to master

Squashed commit of the following:

commit 567db0ec9a92eeab9ca8d915f01d8d8f96273d0f
Author: Neha Sharma <nehash4@cisco.com>
Date:   Mon Nov 30 04:48:26 2020 -0500

    high_availability: Adding the check for packet key equals ha key before consume

Merge pull request #2647 in SNORT/snort3 from ~RDEMPSTE/snort3:removed_inspectors to master

Squashed commit of the following:

commit 7225fb279cd1e10e52599be338717df86035b943
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Tue Dec 8 08:00:54 2020 -0500

    packet_tracer: Fix the debug session information for non-ip packets

commit d9a1d78c903830f71fbe33dc834912204e7f6579
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Wed Dec 2 11:52:54 2020 -0500

    stream: fix stream clean up when going from enabled to disabled

commit 5e6d47c4f4b8370769bb30a88e706ceccb5899ba
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Wed Nov 25 13:51:08 2020 -0500

    managers: don't allow a referenced inspector to stall emptying the trash

commit 1843e30d47f5083a2d84f0061ba56d97dd2b0fe7
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Sat Dec 5 08:02:49 2020 -0500

    managers: track removed inspectors during reload and call tear_down and tterm to release resources

Merge pull request #2658 in SNORT/snort3 from ~MIALTIZE/snort3:catch_update to master

Squashed commit of the following:

commit 8ade74b146db3de41d78a540a1f083793fd02322
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Dec 8 18:09:05 2020 -0500

    build: Clean up various cppcheck warnings

commit 515fdcc0e0d733396c13a256d46fde3087540b55
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Sep 8 11:07:35 2020 -0400

    catch: Avoid using INTERNAL_CATCH_UNIQUE_NAME in our headers

commit 2084175f47ec1007db9952518670d93d9382e8fe
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Dec 8 17:48:18 2020 -0500

    catch: Update to Catch v2.13.3

Merge pull request #2651 in SNORT/snort3 from ~ARMANDAV/snort3:rna_perf to master

Squashed commit of the following:

commit 2e694a09af5ebd6b65fefc0d1d6cefc498e40122
Author: Arun Mandava <armandav@cisco.com>
Date:   Mon Nov 23 12:54:13 2020 -0500

    rna: Reduce host cache lock usage to improve performance

Merge pull request #2652 in SNORT/snort3 from ~MDAGON/snort3:response_depth to master

Squashed commit of the following:

commit 96069fe351ed5344e37c0b4ca75866cd99e1bbc9
Author: mdagon <mdagon@cisco.com>
Date:   Fri Dec 4 12:08:47 2020 -0500

    http2_inspect: handle discard

Merge pull request #2639 in SNORT/snort3 from ~STECHEW/snort3:control_request_fix_shared_ptr to master

Squashed commit of the following:

commit ac1f3fa3866ba47d09512acc3fb3e969b27f5603
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Nov 20 11:48:19 2020 -0500

    main: convert Request to shared_ptr to avoid memory problems.

Merge pull request #2609 in SNORT/snort3 from ~DAVMCPHE/snort3:stream_ha_deactive to master

Squashed commit of the following:

commit e5fe144e3e7b55dd493680d3730ed31664776083
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Nov 10 09:49:42 2020 -0500

    stream_ha: only flush on ha deactivate if not in STANDBY, set ha state to STANDBY when new Flow created

Merge pull request #2608 in SNORT/snort3 from ~SHRARANG/snort3:lua_sandbox to master

Squashed commit of the following:

commit bd0c2a888b69a9791bb2b8dd196c8a6fdd53ca1c
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Fri Jul 31 12:05:26 2020 -0400

    shell: support for loading configuration in lua sandbox

    Load snort configuration in a Lua sandbox. Sandbox configuration file can be specified
    with the command line option "--lua-sandbox". Snort expects this file to contain a Lua
    table named sandbox_env. sandbox_env should specify a list of allowed Lua functions.
    This table is used as the sandbox environment. Snort loads the following in the sandbox:
     - top-level configuration file specified by command line option "-c"
     - subpolicy files
     - all of the included files in above files and also files included in the included files
     - configuration overrides specified with command line option "--lua"
    If any of the above use Lua functionality not allowed in sandbox_env, snort will exit with
    a fatal error.

Merge pull request #2625 in SNORT/snort3 from ~DERAMADA/snort3:interfaces_fix to master

Squashed commit of the following:

commit 5b862eeddb95eb76cba66efb8ce0b4a836b87630
Author: Deepak Ramadass <deramada@cisco.com>
Date:   Tue Nov 17 11:09:55 2020 -0500

    stream_tcp: set interfaces in both directions

Merge pull request #2640 in SNORT/snort3 from ~SMINUT/snort3:data_purge to master

Squashed commit of the following:

commit a6bd13f8bafcf6c639ca28303a97309d860b0079
Author: Silviu Minut <sminut@cisco.com>
Date:   Mon Nov 23 18:19:29 2020 -0500

    rna: support data purge command

Merge pull request #2649 in SNORT/snort3 from ~SATHIRKA/snort3:dump_userappid_conf to master

Squashed commit of the following:

commit b95f65c4330ecf0758c267356413fced7b29d781
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Mon Nov 30 15:43:53 2020 -0500

    cppcheck

commit 51eb4856a7f9ef6e9654e6d4b7a1c6b6126f3af7
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Wed Nov 25 17:03:22 2020 -0500

    appid: Dump userappid configurations upon reloading third-party

Merge pull request #2641 in SNORT/snort3 from ~KATHARVE/snort3:h2i_ss_fix to master

Squashed commit of the following:

commit 59e4058b0b81e8c526ace95e04589dbcae6632ab
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Nov 24 11:05:24 2020 -0500

    http2_inspect: fix empty queue access and some bookkeeping

Merge pull request #2634 in SNORT/snort3 from ~OSERHIIE/snort3:bug_CSCvv38951 to master

Squashed commit of the following:

commit b4a2526daa76194707d882be2656afc89fd164b0
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Mon Nov 23 15:47:52 2020 +0200

    inspector_manager: search for an instance considering inspector type

        * inspector_manager: update instance search API to pass inspector type
        * binder: specify inspector type when getting an instance

Merge pull request #2569 in SNORT/snort3 from ~NEHASH4/snort3:null_flow_crash to master

Squashed commit of the following:

commit fa300bfbf81b674b23c18de4ee80ffad10e9ec2d
Author: Neha Sharma <nehash4@cisco.com>
Date:   Fri Oct 23 03:01:20 2020 -0400

    dce_rpc: fixed incorrect accessing of FileFlows while pruning the flow

Merge pull request #2643 in SNORT/snort3 from ~SATHIRKA/snort3:dhcp_fp_decrypt_store to master

Squashed commit of the following:

commit eb8a898bfbd86b6e7daf74acac95f5d604e8e2a9
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Tue Nov 24 15:32:47 2020 -0500

    rna: Remove unused function

Merge pull request #2629 in SNORT/snort3 from ~MMATIRKO/snort3:active_fix to master

Squashed commit of the following:

commit 41c21f977ec4d6b040353937c7c2f5511a8975f2
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Fri Nov 20 09:36:58 2020 -0500

    active: Fix falling back on using raw IP for active responses when no device is specified

    This only takes effect when the DAQ module does not support injection.

Merge pull request #2638 in SNORT/snort3 from ~SBAIGAL/snort3:shell_core_fix to master

Squashed commit of the following:

commit 0058db07c7aaa0690898c550a2b5310b25a7feb3
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Mon Nov 23 15:31:21 2020 -0500

    reload: reset default policies after failed reload

Merge pull request #2636 in SNORT/snort3 from ~SATHIRKA/snort3:reload_tp_fix to master

Squashed commit of the following:

commit 01f04c1fc93fe47a35064224fb695d1dbf8d54b1
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Fri Nov 20 10:52:28 2020 -0500

    appid: Mark reload third-party complete after unloading old library and creating new third-party context

Merge pull request #2642 in SNORT/snort3 from ~THOPETER/snort3:h2i18 to master

Squashed commit of the following:

commit fe4ebaed9bd43d59603aaee23890cbd7e3ae740e
Author: Tom Peters <thopeter@cisco.com>
Date:   Mon Nov 23 15:55:12 2020 -0500

    http2_inspect: HI error handling improvements

Merge pull request #2637 in SNORT/snort3 from ~MIALTIZE/snort3:metabegone to master

Squashed commit of the following:

commit 60f61048379b17f9a577bfaa78cd90e51dd75153
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Nov 23 12:17:22 2020 -0500

    snort: Add OopsHandlerSuspend for suspending Snort's crash handler

    This is an RAII-style mechanism that will uninstall Snort's "oops"
    handler when created and reinstall it when it goes out of scope.

commit f4f202749f27de376b63f6cc353dbe45c1a4661b
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Nov 23 11:47:06 2020 -0500

    helpers: Handle SIGILL and SIGFPE with the oops handler

commit 49ba9014e5df70bc3c78be25569e092aad38b642
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Nov 20 15:58:41 2020 -0500

    inspector_manager: Remove unused inspector_exists_in_any_policy() function

commit 731ee59c29b04ee0baaa903860a7596d4c5ea046
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Nov 20 15:56:58 2020 -0500

    inspector: Remove obsolete metapacket processing functionality

Merge pull request #2631 in SNORT/snort3 from ~DAVMCPHE/snort3:stream_init_alerts_array to master

Squashed commit of the following:

commit 64ec6d368b42815ad17ae05c6871490e034c80ee
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Fri Nov 20 09:39:25 2020 -0500

    stream_tcp: initialize the alerts array to empty when a TcpReassembler instance is initialized or reset

Merge pull request #2630 in SNORT/snort3 from ~MDAGON/snort3:h2i_err2 to master

Squashed commit of the following:

commit 89ff0a660518e90ad8cbf8dc7557d70d913b1490
Author: mdagon <mdagon@cisco.com>
Date:   Thu Nov 12 16:01:31 2020 -0500

    http2_inspect: check for invalid flags

Merge pull request #2618 in SNORT/snort3 from ~THOPETER/snort3:h2i17 to master

Squashed commit of the following:

commit 58296aa1e56005645325b178504e68f3278b7f0d
Author: Tom Peters <thopeter@cisco.com>
Date:   Mon Nov 9 12:36:10 2020 -0500

    http2_inspect: improve error handling

Merge pull request #2633 in SNORT/snort3 from ~RDEMPSTE/snort3:export_forwarding_packet to master

Squashed commit of the following:

commit 3bdb73fff9ce36714c447ac5755c969287a75462
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Wed Nov 18 14:57:13 2020 -0500

    packet_io: export forwarding_packet function

Merge pull request #2632 in SNORT/snort3 from ~MMATIRKO/snort3:rna_tabs to master

Squashed commit of the following:

commit c5b2f7783477161450f5188f0eeaf783557c5956
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Fri Nov 20 09:48:36 2020 -0500

    rna: replace some tabs with spaces as per style guidelines

Merge pull request #2624 in SNORT/snort3 from ~MMATIRKO/snort3:cdp to master

Squashed commit of the following:

commit 2f63f2b745c53ad2a62bb3563d3c05248662bc54
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Wed Nov 18 12:54:25 2020 -0500

    rna: generate new host event for CDP traffic

Merge pull request #2626 in SNORT/snort3 from ~KATHARVE/snort3:binder to master

Squashed commit of the following:

commit 08ec70c0f5695bc204a00b5a11c580daeac6b1d8
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Nov 17 11:41:09 2020 -0500

    binder: pass service to get_bindings on flow service change

Merge pull request #2617 in SNORT/snort3 from ~SHRARANG/snort3:appid_http_fixes to master

Squashed commit of the following:

commit b7ab85456eef818f937b46a2451a2de19c1961cc
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Fri Nov 13 16:35:59 2020 -0500

    appid: do not override http fields with empty values

commit adcccb07de640c0298b5cf4c89da19fe36d6a436
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Fri Nov 13 16:35:29 2020 -0500

    appid: for http2 flow, return service id as http2 when no streams are yet created

Merge pull request #2613 in SNORT/snort3 from ~KATHARVE/snort3:h2i_headers_close to master

Squashed commit of the following:

commit 85d3938fcd179b22ee2bceac441be1b1d9049738
Author: Katura Harvey <katharve@cisco.com>
Date:   Thu Oct 29 12:39:05 2020 -0400

    http2_inspect: handle connection close during headers frames

Merge pull request #2621 in SNORT/snort3 from ~KAMURTHI/snort3:lua_detector_error to master

Squashed commit of the following:

commit 15669449030f36a201602d455658d4c705264d0c
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Mon Nov 16 07:31:28 2020 -0500

    appid: print more descriptive error message when lua detector registers invalid pattern.

Merge pull request #2622 in SNORT/snort3 from ~BBANTWAL/snort3:help_module_itype to master

Squashed commit of the following:

commit 9316db8c7d65535e9c18bbe2df04914760e8423e
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Nov 16 18:32:09 2020 -0500

    managers: add inspector type in the help module output

Merge pull request #2616 in SNORT/snort3 from ~MASHASAN/snort3:exp_request to master

Squashed commit of the following:

commit 0f308941c37f049b2a4e2b0719d82697d6c0a5e0
Author: Masud Hasan <mashasan@cisco.com>
Date:   Thu Nov 12 19:56:02 2020 -0500

    request: Expose methods to be used in plugins

Merge pull request #2596 in SNORT/snort3 from ~VKAMBALA/snort3:vkambala to master

Squashed commit of the following:

commit 51d44ef769bddb1616445b20425a069a090cdf01
Author: krishnakanth <vkambala@cisco.com>
Date:   Wed Nov 4 02:19:18 2020 -0500

    file_api: handling resume block when multiple file rules are configured with store option enabled

Merge pull request #2615 in SNORT/snort3 from ~SBAIGAL/snort3:host_attr_fix to master

Squashed commit of the following:

commit e4720b210f3c993e9bf55c1680bfe910c762b810
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Tue Nov 10 19:09:45 2020 -0500

    host_attributes: better error handling for reload to eliminate double free and memory leaks

Merge pull request #2605 in SNORT/snort3 from ~SATHIRKA/snort3:rna_dhcp_fp_framework to master

Squashed commit of the following:

commit 1b3cbac56c1965b568232d886c6bb5913c18e5c9
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Mon Sep 21 17:29:55 2020 -0400

    rna: Support DHCP fingerprint matching and event generation

Merge pull request #2610 in SNORT/snort3 from ~SHASLAD/snort3:language_correction_1 to master

Squashed commit of the following:

commit 40baacb8e5f963d60e6abf34f3d12cb2174f023b
Author: Shashi Lad <shaslad@cisco.com>
Date:   Tue Nov 10 09:28:18 2020 -0500

    appid: change terms used in code, logs and peg counts

commit 10e1181a941eda0805666dc3da48cbba35806636
Author: Shashi Lad <shaslad@cisco.com>
Date:   Tue Nov 10 09:28:08 2020 -0500

    shell: change terms used in code, logs and peg counts

Merge pull request #2620 in SNORT/snort3 from ~MIALTIZE/snort3:3_0_3_build_5 to master

Squashed commit of the following:

commit 8e5ce3384dd09812f970867573d0b7dae26327cf
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Nov 16 12:05:34 2020 -0500

    build: Generate and tag 3.0.3 build 5

commit 392ec3ea76e567eeb8805312a577d3d0e10a0bc4
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Nov 4 11:43:54 2020 -0500

    flow: Flesh out swap_roles() to swap more client/server fields

Merge pull request #2612 in SNORT/snort3 from ~BRASTULT/snort3:byte_math_cursor_fix to master

Squashed commit of the following:

commit a24ffdb10189a6022716a9e9e7f5521c1604461e
Author: Brandon Stultz <brastult@cisco.com>
Date:   Tue Nov 10 13:18:23 2020 -0500

    ips_options: don't move cursor in byte_math

Merge pull request #2607 in SNORT/snort3 from ~MASHASAN/snort3:user_logins to master

Squashed commit of the following:

commit 3010559b529e126340058c30dec48457493ddb4a
Author: Masud Hasan <mashasan@cisco.com>
Date:   Sun Nov 8 21:13:23 2020 -0500

    rna: Support user login failure discovery

Merge pull request #2602 in SNORT/snort3 from ~MMATIRKO/snort3:delete_pld to master

Squashed commit of the following:

commit 9ce30c2e4c67083106e3d5b3ccacc1c58cf6c3a6
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Wed Nov 4 12:28:30 2020 -0500

    rna: delete payloads when clients, services are deleted; add unit tests

Merge pull request #2606 in SNORT/snort3 from ~ARMANDAV/snort3:rna_service to master

Squashed commit of the following:

commit dd50d18bef501ad08df34b257bd7d84d3265921b
Author: Arun Mandava <armandav@cisco.com>
Date:   Thu Nov 5 21:53:49 2020 -0500

    rna: support change service event with null version and vendor

Merge pull request #2598 in SNORT/snort3 from ~DAVMCPHE/snort3:stream_meta-ack_tweaks to master

Squashed commit of the following:

commit 66fac93883643ab1106370c80dbe6c83920f431d
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Nov 4 12:45:37 2020 -0500

    stream_tcp: remove redundant/unneeded asserts that check if tcp event is for a meta-ack psuedo-packet

Merge pull request #2588 in SNORT/snort3 from ~OSHUMEIK/snort3:trace_refactor to master

Squashed commit of the following:

commit 2f992d73028bc9d9f803856790ffb59a085c725a
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Tue Oct 27 14:35:20 2020 +0200

    trace: add missing packet information to some of the messages

Merge pull request #2595 in SNORT/snort3 from ~KDEWANGA/snort3:ftp_test to master

Squashed commit of the following:

commit 2cd7609ecc9008ca733be3cabb7ff3aacdb01fc1
Author: kdewanga <kdewanga@cisco.com>
Date:   Wed Nov 4 04:48:06 2020 -0500

    ftp: Handling FTP detection when ftp data segment size changes

Merge pull request #2597 in SNORT/snort3 from ~MDAGON/snort3:injector_refactor to master

Squashed commit of the following:

commit 309221de1466bd5bcabf52c70960da18648f1291
Author: mdagon <mdagon@cisco.com>
Date:   Wed Oct 28 14:45:49 2020 -0400

    payload_injector: refactoring

Merge pull request #2603 in SNORT/snort3 from ~THOPETER/snort3:h2i16 to master

Squashed commit of the following:

commit 682542cf2fdb9d56f109e64a7df782f5100ad778
Author: Tom Peters <thopeter@cisco.com>
Date:   Thu Nov 5 15:52:09 2020 -0500

    http2_inspect: refactor data cutter

Merge pull request #2586 in SNORT/snort3 from ~MMATIRKO/snort3:rna_segv to master

Squashed commit of the following:

commit a1012cf0fc48e199d65bf7537c0bd519dba0a221
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Mon Nov 2 18:28:25 2020 -0500

    rna: don't process packet in eval if eth bit not set

Merge pull request #2601 in SNORT/snort3 from ~THOPETER/snort3:h2i15 to master

Squashed commit of the following:

commit f35d413cb1bb34ade07ef07468708568e2b8d8e4
Author: Tom Peters <thopeter@cisco.com>
Date:   Mon Nov 2 17:49:48 2020 -0500

    http2_inspect: refactoring scan()

Merge pull request #2579 in SNORT/snort3 from ~SATHIRKA/snort3:client_login_failure to master

Squashed commit of the following:

commit 2e0205b16c0c50de6348a5b7a5999eb0aa59d483
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Fri Oct 23 16:35:57 2020 -0400

    appid: Support client login failure event

Merge pull request #2600 in SNORT/snort3 from ~MDAGON/snort3:h2i_const to master

Squashed commit of the following:

commit 13312b5b7633695aae4db9b8e929d2ee1e2076fe
Author: mdagon <mdagon@cisco.com>
Date:   Thu Nov 5 10:16:18 2020 -0500

    http2_inspect: remove const cast