Merge pull request #2488 in SNORT/snort3 from ~MDAGON/snort3:reload_module to master

Squashed commit of the following:

commit 8b5419bb4e2d4a351616d8b8ddeeb830a685c763
Author: mdagon <mdagon@cisco.com>
Date:   Thu Sep 17 14:27:46 2020 -0400

    module_manager: keep a list of modules supporting reload_module.
    Return error for attempts to reload a module that isn't in the list.

Merge pull request #2476 in SNORT/snort3 from ~CYLEONAR/snort3:ftpupload to master

Squashed commit of the following:

commit f40c6cffa3e25a67dddcb67fa574e352a450f005
Author: Cynthia Leonard <cyleonar@cisco.com>
Date:   Tue Sep 15 14:36:05 2020 -0400

    ftp: Add APPE to upload commands

Merge pull request #2487 in SNORT/snort3 from ~SVLASIUK/snort3:dump_sorted_config_options to master

Squashed commit of the following:

commit c11944eba35d03642f82b0f50d4bdab2c65717ab
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Fri Sep 18 11:36:01 2020 +0300

    dump_config: sort config options before printing

Merge pull request #2457 in SNORT/snort3 from ~DERAMADA/snort3:term_changes to master

Squashed commit of the following:

commit d0d90374fef89082cede713f0168f68322643ad6
Author: deramada <deramada@cisco.com>
Date:   Tue Sep 1 22:16:51 2020 -0400

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

Merge pull request #2478 in SNORT/snort3 from ~THOPETER/snort3:h2i4 to master

Squashed commit of the following:

commit 5fb3446f7c55d1061ccda7b7566a437a08d702b7
Author: Tom Peters <thopeter@cisco.com>
Date:   Tue Sep 15 19:49:55 2020 -0400

    http2_inspect: refactor HI interactions out of frame constructors

Merge pull request #2434 in SNORT/snort3 from ~MMATIRKO/snort3:new_os_event to master

Squashed commit of the following:

commit d87e89abad84703102a8c034bf2cac25ddadebb8
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Wed Aug 26 14:10:14 2020 -0400

    rna: avoid conflicts with other fingerprint definitions

Merge pull request #2426 in SNORT/snort3 from ~DAVMCPHE/snort3:stream_tcp_fixits to master

Squashed commit of the following:

commit 13038c9f32725d9286103fca639511b3d236378d
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Sep 16 16:55:38 2020 -0400

    stream_tcp: refactor tcp handling of no flags to drop packet before any processing, don't generate event

commit 3e19864b0c21b1a08295e8d0c935cfb29d216d91
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Mon Sep 14 09:22:40 2020 -0400

    stream_tcp: updates to resolve PR review comments

commit 0d05172e8d97fc8c98105ec7636a258e9a1d7f8a
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Sep 9 10:05:01 2020 -0400

    stream_tcp: merge the setup methods of the TcpStreamSession and TcpSession classes into a single method in TcpSession

commit df18ba9cdd09abe0400ae41820d2f1d4ca688068
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Aug 26 09:33:15 2020 -0400

    stream_tcp: add PegCount for tcp packets received with an invalid ack

commit ac9f49387302084104403c3c0a490741bd00fe92
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Aug 26 09:14:27 2020 -0400

    stream_tcp: delete unused packet action flags, set action flags via its setter

commit bd0cf57e31549ec2fc9eb82cf4f3d276e0bd8db9
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Aug 26 08:09:31 2020 -0400

    stream_tcp: delete redundant calls to flush data when FIN is received

commit 3280c0ba1d11d045459483d741ab8b81031ca070
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Thu Aug 13 10:34:15 2020 -0400

    stream_tcp: handle bad tcp packets consistently when normalizing in ips mode

commit 3058628b9d04b8e513c92e63ee20265fb76f3f97
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Aug 11 16:04:18 2020 -0400

    stream_tcp: add an assert to catch tcp state/event combination that should not occur

commit 0f383f759e850602e17e12ea6fd78f35b31a81c0
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Aug 11 15:55:40 2020 -0400

    stream_tcp: remove FIXIT-H to add ack validation, the ack is already validated when processed on the listener side

commit 7570270137e4ee288ab892a81305dc2cc4671849
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Aug 11 15:43:52 2020 -0400

    stream_tcp: implement helper function to return true if the TCP packet is a data segment, false otherwise

commit acd13bf5378f9f80c4d757ef710c4d104d77d714
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Aug 11 15:21:46 2020 -0400

    stream_tcp: this FIXIT-H has been removed because by definition an Ack Sent event in TcpStateNone means the SYN-ACK was not seen, so no way to do the check suggested

commit b4ebcb37e6c2045b0f78bd4e12f1d2b3eb337353
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Mon Aug 10 10:02:02 2020 -0400

    stream_tcp: arrange TCP tracker member vars to optimize storage requirements, add helper functions to access private splitter functions

    stream_tcp: refactor tracker and reassembler classes to improve encapsulation and move member variables to appropriate class

commit ce9d8536c14011dc4dc33f43d33259a76c0f6e9d
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Jul 21 13:31:28 2020 -0400

    stream_tcp: fix issues with stream_tcp handling of the TCP MSS option

Merge pull request #2481 in SNORT/snort3 from ~NEHASH4/snort3:smb_ut_failure to master

Squashed commit of the following:

commit 18c263d3f2978092d2d3630f35638c18baafcfd2
Author: Neha Sharma <nehash4@cisco.com>
Date:   Thu Sep 17 02:22:48 2020 -0400

    dec_rpc: modifying logs to show if file context is found or not found

Merge pull request #2468 in SNORT/snort3 from ~KATHARVE/snort3:http_cont_disp to master

Squashed commit of the following:

commit 0000fe4885165c1f1c1461635a78257bd9ee7046
Author: Katura Harvey <katharve@cisco.com>
Date:   Wed Sep 9 16:55:08 2020 -0400

    http_inspect: extract filename from content-disposition header for HTTP uploads

Merge pull request #2459 in SNORT/snort3 from ~DAVMCPHE/snort3:reload_hosts_sigurg to master

Squashed commit of the following:

commit e28bb7d47acd917c99232cf5dbcf304c6e41a1dc
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Thu Sep 3 09:00:04 2020 -0400

    target_based: support reload of host attribute table via signal as well as control channel command

Merge pull request #2441 in SNORT/snort3 from ~BSACHDEV/snort3:timeout_bug to master

Squashed commit of the following:

commit a98f92fcb5f3806a5c34b96b760b33ebfc9a94cb
Author: bsachdev <bsachdev@cisco.com>
Date:   Mon Aug 31 01:28:06 2020 -0400

    file_api: updating lookup and block timeout from config at file cache creation

Signed-off-by: bsachdev <bsachdev@cisco.com>

Merge pull request #2473 in SNORT/snort3 from ~THOPETER/snort3:h2i3 to master

Squashed commit of the following:

commit 4915334804e793384139ea575b935a12988ac21c
Author: Tom Peters <thopeter@cisco.com>
Date:   Mon Sep 14 14:20:09 2020 -0400

    http2_inspect: convert to new stream states

Merge pull request #2466 in SNORT/snort3 from ~KAMURTHI/snort3:ultrasurf_thirdparty to master

Squashed commit of the following:

commit 7bf244eaf487f78289c03b8fbfe16772cd872249
Author: kamurthi <kamurthi@cisco.com>
Date:   Tue Sep 8 09:24:44 2020 -0400

    appid: Use third party payload if available for HTTP tunneled.

Merge pull request #2472 in SNORT/snort3 from ~MIALTIZE/snort3:3_0_2_build_6 to master

Squashed commit of the following:

commit fc525e0d3bcaf819080ecc9959fc0f4698052135
Author: Michael Altizer <mialtize@cisco.com>
Date:   Sun Sep 13 14:44:11 2020 -0400

    build: Generate and tag 3.0.2 build 6

Merge pull request #2399 in SNORT/snort3 from ~NEHASH4/snort3:dce_smb_logs to master

Squashed commit of the following:

commit 37b3a79e4b2c464593dd93399bfa2e1e11e6bed2
Author: Neha Sharma <nehash4@cisco.com>
Date:   Thu Aug 13 02:12:58 2020 -0400

    dec_rpc: introducing smb2 logs

Merge pull request #2469 in SNORT/snort3 from ~OSHUMEIK/snort3:wand to master

Squashed commit of the following:

commit 1c363abe0803a853ce6945c35fc58ed1b091265b
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Fri Sep 11 11:50:10 2020 +0300

    wizard: fix the error message about invalid pattern

Merge pull request #2467 in SNORT/snort3 from ~SATHIRKA/snort3:appid_warnings to master

Squashed commit of the following:

commit bce8003b48e40345380baa2ae8e32a046bfc7555
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Wed Sep 9 16:41:01 2020 -0400

    appid: Update appid warning messages to print module name in lowercase

Merge pull request #2458 in SNORT/snort3 from ~EBURMAI/snort3:decrypted_smtp to master

Squashed commit of the following:

commit 7a870446615e9ebd29ef3358104e60e79fa62621
Author: Eduard Burmai <eburmai@cisco.com>
Date:   Fri Sep 11 05:44:02 2020 -0400

    appid: detect SMTP after decryption

commit 09baaf304cc69cdbc4484ad763bdb8991709fe6b
Author: Eduard Burmai <eburmai@cisco.com>
Date:   Tue Sep 1 08:49:55 2020 -0400

    appid: update appid stats for decrypted flows

Merge pull request #2460 in SNORT/snort3 from ~RUCOMBS/snort3:b4rc to master

Squashed commit of the following:

commit 178c3e27da00bd22f43c0b8938a66e87420accca
Author: russ <rucombs@cisco.com>
Date:   Sat Sep 5 10:20:03 2020 -0400

    build: fix minor cppcheck warnings

commit 6fb3475f2cba53e0bb7c5da61f1116f0e2f58be9
Author: russ <rucombs@cisco.com>
Date:   Fri Sep 4 19:48:09 2020 -0400

    byte_jump: fix jump relative to extracted length w/o relative offset

    Thanks to James Manger for reporting the problem.

commit f201d1535a7cd71a574db9674bf8557a6cbeaacd
Author: russ <rucombs@cisco.com>
Date:   Fri Sep 4 19:21:03 2020 -0400

    IPS options: ensure all options use base class hash and compare methods

commit fe5c4284fd53c4d257e0f19631cb3bbddd44ed89
Author: russ <rucombs@cisco.com>
Date:   Fri Sep 4 16:15:21 2020 -0400

    snort: address fatal shutdown stability issues

    First: upon a fatal error, don't attempt to exit from other than the
    main thread to avoid hanging waiting on other threads.

    Second: don't attempt general clean up except for REG_TEST builds.  This
    is attempted only to avoid voluminous leak sanitizer dumps.  Clean exit
    if fraught with peril upon fatal and should not crash production builds.

    Third: explicilty stop file service in case the capture thread is
    running to avoid hanging on shutdown.

    TBD: eliminate unnecessary fatal conditions which should only exist from
    the main thread and only at startup.  Runtime fatals must all be
    converted to graceful shutdowns to avoid leaking external resources.
    Also need a more general scheme for managing aux threads.

commit 476a0e5d9b3b201de309a305855525b530137f36
Author: russ <rucombs@cisco.com>
Date:   Fri Sep 4 13:43:40 2020 -0400

    http_method: make available for fast pattern with first body section

commit 5a3fa3408b764b116839abe93c80ba3420977e9b
Author: russ <rucombs@cisco.com>
Date:   Tue Sep 1 15:51:54 2020 -0400

    mime: minor code cleanup

commit 1a2cb474d3fedadbe35604f85d24ac890d5bb75a
Author: russ <rucombs@cisco.com>
Date:   Tue Sep 1 15:36:25 2020 -0400

    mime: fix off-by-1 error with filename and email id capture

    Thanks to Y M <snort@outlook.com> for reporting the issue.

Merge pull request #2445 in SNORT/snort3 from ~THOPETER/snort3:lit_script to master

Squashed commit of the following:

commit 4f9f4879a38c0b385d012088b0fc05b9b2909fc0
Author: russ <rucombs@cisco.com>
Date:   Wed Aug 26 20:31:17 2020 -0400

    http_inspect: support hyperscan literal search for accelerated blocking

Merge pull request #2465 in SNORT/snort3 from ~MMATIRKO/snort3:uuid_fix to master

Squashed commit of the following:

commit 2a15dbe7a45f4180ceb83dbd72abf50827ab35c5
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Mon Aug 31 17:17:23 2020 -0400

    rna: remove dependency on uuid library

Merge pull request #2306 in SNORT/snort3 from ~SUNIMUKH/snort3:CSCvu79452 to master

Squashed commit of the following:

commit 873b964c11d555ba6dcbb97a30987335caaa090d
Author: Sunirmal Mukherjee <sunimukh@cisco.com>
Date:   Tue Jun 30 14:08:29 2020 -0400

    flow: disabled inspection for FlowState::RESET

Merge pull request #2456 in SNORT/snort3 from ~KAMURTHI/snort3:pkt_OOO to master

Squashed commit of the following:

commit 34f8a158f2501809f47d7a5384c2d83740c9402d
Author: kamurthi <kamurthi@cisco.com>
Date:   Wed Sep 2 21:07:19 2020 -0400

    appid: set payload to unknown for out-of-order flows

Merge pull request #2455 in SNORT/snort3 from ~SHASLAD/snort3:netflow_as_inspector to master

Squashed commit of the following:

commit 08bc5e0c873d97912e9986c5f3ee57ab5eeb0831
Author: Shashi Lad <shaslad@cisco.com>
Date:   Fri Aug 28 08:18:29 2020 -0400

    netflow: introducing netflow as inspector

Merge pull request #2452 in SNORT/snort3 from ~SATHIRKA/snort3:dump_user_appid_conf_reload to master

Squashed commit of the following:

commit 53760dc07886359c1b1cb39b583c4a9bc66ddf26
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Wed Sep 2 16:26:58 2020 -0400

    appid: Dump user appid configuration on reload detectors

Merge pull request #2435 in SNORT/snort3 from ~SUNIMUKH/snort3:zone-group to master

Squashed commit of the following:

commit 2dd056ac9f6e65d99293d914ebc505636d8ba03a
Author: Sunirmal Mukherjee <sunimukh@cisco.com>
Date:   Tue Sep 1 03:10:30 2020 -0400

    build: Updates for libdaq changes to interface group field width and naming

commit ede03a067cf4c5fa98321453d97a1cda544c6b1d
Author: Sunirmal Mukherjee <sunimukh@cisco.com>
Date:   Tue Sep 1 03:09:18 2020 -0400

    helpers: Rework DiscoveryFilter to monitor IP lists based on interface rather than group

commit dc80cdbeb1b12913b5f3968a49e8cc5db5da6d2e
Author: Sunirmal Mukherjee <sunimukh@cisco.com>
Date:   Tue Sep 1 02:56:54 2020 -0400

    reputation: Change from group-based to interface-based IP lists

Merge pull request #2440 in SNORT/snort3 from ~OSERHIIE/snort3:doc_trace_all_modules_option to master

Squashed commit of the following:

commit 58f14dbd305d6e7b2cc820e5c1bfbc074ae8f5fe
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Fri Aug 28 13:05:31 2020 +0300

    doc: update trace.txt with info about 'trace.modules.all' option

Merge pull request #2439 in SNORT/snort3 from ~OSERHIIE/snort3:trace_all_modules_option to master

Squashed commit of the following:

commit 63012926daf4107ca5ae00376d9cdef0fdd39212
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Wed Aug 26 12:27:05 2020 +0300

    trace: add support for modules.all option

Merge pull request #2446 in SNORT/snort3 from ~MASHASAN/snort3:fp_reload to master

Squashed commit of the following:

commit 6971b4c9c09c425532ccf946106d911f16b50d56
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Aug 31 17:01:52 2020 -0400

    rna: Removing unused command and exporting swapper

Merge pull request #2448 in SNORT/snort3 from ~SATHIRKA/snort3:clear_snort_protoid_reload to master

Squashed commit of the following:

commit 8033a1cefaf99d7c5f8818971de44dc9fcc33f60
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Tue Sep 1 12:37:55 2020 -0400

    appid: Clear services set in host attribute table upon detector reload

Merge pull request #2447 in SNORT/snort3 from ~SHRARANG/snort3:appid_tp_reload_reorder to master

Squashed commit of the following:

commit df9e98dfacc0edb9a9f1861357a09e6c73ded252
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Thu Aug 27 17:28:49 2020 -0400

    appid: reorder third-party reload to keep only one handle open at a time

Merge pull request #2453 in SNORT/snort3 from ~STECHEW/snort3:move_term_signal to master

Squashed commit of the following:

commit b3e7752fee4aa1b2d81af24ca37b39500f7f899f
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Sep 2 14:50:51 2020 -0400

    main: Turn off signal handlers later to catch more during snort shutdown.

Merge pull request #2449 in SNORT/snort3 from ~KATHARVE/snort3:h2i_trailers_2 to master

Squashed commit of the following:

commit 95037139d8ecd2ec236ecfa747e8411b08f81912
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Sep 1 17:26:13 2020 -0400

    http2_inspect: fix hpack dynamic table init

commit 79454c069e4247d33cbb565fa1a9cba643d1360d
Author: Katura Harvey <katharve@cisco.com>
Date:   Thu Aug 27 09:18:45 2020 -0400

    http2_inspect: refactor hpack decoding and send trailer to http_inspect for processing

Merge pull request #2450 in SNORT/snort3 from ~OKHOMIAK/snort3:jolt2_attack to master

Squashed commit of the following:

commit f57e74ffc9ec150810f7c7bf6c62c1cc5c393a5f
Author: Oleksii Khomiakovskyi <okhomiak@cisco.com>
Date:   Wed Sep 2 13:09:53 2020 +0300

    frag3: fix zero fragment built-in rule triggering for some reassembly policies

Merge pull request #2454 in SNORT/snort3 from ~THOPETER/snort3:nhttp149 to master

Squashed commit of the following:

commit d0715acf006ad328ec79e7270eb02828d45ed0f6
Author: Tom Peters <thopeter@cisco.com>
Date:   Wed Sep 2 19:49:39 2020 -0400

    http_inspect: script detection and concurrency fixes

Merge pull request #2443 in SNORT/snort3 from ~MDAGON/snort3:field_127 to master

Squashed commit of the following:

commit 18a108729bf0f36b122bebc77460447862c772f4
Author: mdagon <mdagon@cisco.com>
Date:   Tue Aug 18 14:43:56 2020 -0400

    payload_injector: support translation of header field value with length > 127

Merge pull request #2418 in SNORT/snort3 from ~KBHANDAN/snort3:set_ips_for_pseudo_pdu to master

Squashed commit of the following:

commit 98bfc2729f03abfccfaad361591fdac5dcdb4705
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Thu Aug 20 09:47:47 2020 -0400

    ips: use the policies in the flow when creating pseudo packet

Merge pull request #2433 in SNORT/snort3 from ~MIALTIZE/snort3:snort2lua_cleanup to master

Squashed commit of the following:

commit 7fc4a5c41f788b512ff8e07af2de85f34a921741
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 12:28:57 2020 -0400

    snort2lua: Remove obsolete and unused code

    Along with other dead code cleanup, this removes the conversion support
    for firewall, nap_selector, and sfunified2.

commit b5cac33bdccc75c19efad1e1762bbdb5fc4128e9
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 12:28:47 2020 -0400

    snort2lua: Remove unused unit test files

Merge pull request #2432 in SNORT/snort3 from ~RDEMPSTE/snort3:plugins to master

Squashed commit of the following:

commit d381d49e800420f551024c4a5a275e541736e107
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Tue Sep 1 10:29:54 2020 -0400

    payload_injector: assume http1, if packet does not have a gadget

Merge pull request #2437 in SNORT/snort3 from ~ARMANDAV/snort3:rna_client_disc to master

Squashed commit of the following:

commit c3efbd690571824a3ced29722fae510d055b33df
Author: Arun Mandava <armandav@cisco.com>
Date:   Fri Aug 28 12:18:56 2020 -0400

    rna: Support client discovery from appid event changes

Merge pull request #2436 in SNORT/snort3 from ~MDAGON/snort3:fix_warning to master

Squashed commit of the following:

commit e7d22e9969b20f155453634ed6e3277f3160f924
Author: mdagon <mdagon@cisco.com>
Date:   Mon Aug 31 15:12:20 2020 -0400

    code review: initialize select fields instead of using memset

commit ab983114ee4e375e3bac1407fb474409e18de9da
Author: mdagon <mdagon@cisco.com>
Date:   Fri Aug 28 13:01:23 2020 -0400

    payload_injector: fix warning

Merge pull request #2444 in SNORT/snort3 from ~MIALTIZE/snort3:freebsd to master

Squashed commit of the following:

commit c12beed04d5a2988dacc479a8c56b19fa1924412
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Aug 31 22:58:40 2020 -0400

    helpers: Fix build on systems without sigaction

commit dc8959e04466d76792605447c3236fb2858f0104
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Aug 31 22:53:15 2020 -0400

    helpers: Use sig_t instead of sighandler_t for better BSD compatibility

Merge pull request #2427 in SNORT/snort3 from ~MIALTIZE/snort3:cpputest_leaks to master

Squashed commit of the following:

commit f1f70793fa2f9bfa46a9f48245372df2899bcc5a
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Aug 31 15:35:04 2020 -0400

    host_tracker: Fix allocator unit test to work on 32-bit systems again

commit 85a78101fe8bfb9d3055488bcba029ec4e430f02
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 13:43:28 2020 -0400

    cmake: Restore accidentally removed caching of static DAQ modules

commit a89ffd26d712ca56ee8fafe24e1d64f616fc9c8b
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 11:15:02 2020 -0400

    utils: Add sys/time.h to util.h for struct timeval definition

    This fixes the Alpine Linux build issue where the forward declaration
    of struct timval from ts_print() ended up in the snort namespace.

commit d3c78c5f6ec5fbc21231043512a3d90e30488e64
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Aug 27 11:12:32 2020 -0400

    rna: Remove redefinition of USHRT_MAX

commit 9393c5e3621b1900acf15d07e08020c98be763cd
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Aug 25 12:41:00 2020 -0400

    tests: Fix the majority of memory leaks in CppUTest unit tests

    Additionally, this allows us to use the finally released CppUTest 4.0.

commit 7d363fe48a6a11836bd9e44f2fd8d54f936acafc
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Aug 25 17:18:19 2020 -0400

    style: Replace some tabs that snuck in with proper spaces

Merge pull request #2438 in SNORT/snort3 from ~KATHARVE/snort3:cppcheck_fix to master

Squashed commit of the following:

commit ff30d14526f064e5f5960b68e718585df543ed85
Author: Katura Harvey <katharve@cisco.com>
Date:   Sun Aug 30 14:18:30 2020 -0400

    http2_inspect: convert circular_array to std:vector

Merge pull request #2424 in SNORT/snort3 from ~KATHARVE/snort3:h2i_trailers to master

Squashed commit of the following:

commit 347853866023f7d14265f82b4b293e4268f8761c
Author: Katura Harvey <katharve@cisco.com>
Date:   Sun Aug 30 11:27:18 2020 -0400

    http_inspect: declare get_type_expected const

commit 3bc9d0c468a83e2a6ee7c4a61bcb3a329adf2b87
Author: Katura Harvey <katharve@cisco.com>
Date:   Fri Aug 21 11:29:23 2020 -0400

    http2_inspect: prepare http2_inspect and http_inspect for HTTP/2 trailers

commit 89063a23fb743327f59e9ef59444154aea32047f
Author: Katura Harvey <katharve@cisco.com>
Date:   Fri Aug 21 11:28:41 2020 -0400

    http2_inspect: fix continuation frame check

Merge pull request #2420 in SNORT/snort3 from ~MASHASAN/snort3:rna_app_service to master

Squashed commit of the following:

commit ad66c9f37f7beb0a3cbf0a18834a1b8994dd7d54
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Aug 14 21:45:23 2020 -0400

    rna: Support service discovery from appid event changes

commit 9aa8d405eda1fe08496ea613d3049c5eb75da235
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Fri Aug 14 06:22:01 2020 -0400

    appid: Generate events for service info changes

Merge pull request #2425 in SNORT/snort3 from ~CLJUDGE/snort3:ssl_check_host_for_null to master

Squashed commit of the following:

commit 2d74e652df3a89b010de5eb38bfea7e2dc955efe
Author: cljudge <cljudge@cisco.com>
Date:   Tue Aug 18 01:26:19 2020 -0400

    appid: adding check for nullptr before setting tls host

Merge pull request #2407 in SNORT/snort3 from ~MDAGON/snort3:translate2 to master

Squashed commit of the following:

commit 169cd2c9214765cf3756a7ba82e5f15161dd13fa
Author: mdagon <mdagon@cisco.com>
Date:   Wed Jul 29 10:37:03 2020 -0400

    payload_injector: support http2 injection

Merge pull request #2429 in SNORT/snort3 from ~OSHUMEIK/snort3:doc_fix to master

Squashed commit of the following:

commit 87b3e2266f9721e7fe6af81048f25e06aab7c33e
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Tue Aug 25 22:23:43 2020 +0300

    doc: reword the sentence to use the correct words

Merge pull request #2409 in SNORT/snort3 from ~OKHOMIAK/snort3:trace_add_ntuple to master

Squashed commit of the following:

commit bf8a7d52b3b4f28d90095cb276223a7f2da44f08
Author: Oleksii Khomiakovskyi <okhomiak@cisco.com>
Date:   Tue Aug 18 13:53:49 2020 +0300

    trace: update loggers to support extended output with n-tuple packet info

Merge pull request #2353 in SNORT/snort3 from ~SMINUT/snort3:tcp_fp_io to master

Squashed commit of the following:

commit d8f33db11b1589cf65dddc77fde9cb428f747e7e
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Jul 28 18:48:55 2020 -0400

    rna: tcp fingerprints configuration, storage, matching and event generation

Merge pull request #2384 in SNORT/snort3 from ~SATHIRKA/snort3:skip_detection_old_config to master

Squashed commit of the following:

commit df50d6ceb4829ca89ee24ba6f95ba58cf4c5a2e9
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Thu Aug 6 17:02:49 2020 -0400

    appid: Skip detection for existing sessions after detector reload; rename reload_odp command to reload_detectors

Merge pull request #2380 in SNORT/snort3 from ~SHRARANG/snort3:appid_listener_more_logging to master

Squashed commit of the following:

commit 86da97002e7b8c30e75cd99817ab5bab9cf1e19a
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Wed Aug 5 11:14:54 2020 -0400

    appid: support json logging in appid_listener

Merge pull request #2410 in SNORT/snort3 from ~DERAMADA/snort3:pop3_start_tls to master

Squashed commit of the following:

commit 144967eebc309fcc88eae236e868cb2ecab2baed
Author: deramada <deramada@cisco.com>
Date:   Wed Aug 19 09:40:10 2020 -0400

    pop: publish start_tls events, support for ssl search abandoned

Merge pull request #2419 in SNORT/snort3 from ~EBURMAI/snort3:sip_future_session to master

Squashed commit of the following:

commit a8138a99828ef883106248ea028750845c71e888
Author: Eduard Burmai <eburmai@cisco.com>
Date:   Tue Aug 25 08:14:58 2020 -0400

    appid: Pass snort protocol id instead of appid while creating future flow

Merge pull request #2421 in SNORT/snort3 from ~OSHUMEIK/snort3:doc_dump_config to master

Squashed commit of the following:

commit 5c61850d9548f38433bad7adf1b1e2b8da730762
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Fri Aug 21 16:12:24 2020 +0300

    doc: update the config dump in JSON format (main policy)

commit 8584173190dc92a07e381dcf84083c1ca46e030c
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Tue Aug 11 17:27:11 2020 +0300

    doc: update the config dump in JSON format (all policies)

Merge pull request #2412 in SNORT/snort3 from ~OSHUMEIK/snort3:dump_config_top to master

Squashed commit of the following:

commit 1830d71daba5ee91ee67f1d5570f9ef2872488fe
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Tue Aug 18 14:58:19 2020 +0300

    dump_config: add --dump-config="top" to dump the main policy config only

Merge pull request #2405 in SNORT/snort3 from ~THOPETER/snort3:nhttp140a to master

Squashed commit of the following:

commit 9576a7b759fa2a697ae18e56ec528460ec0f5a61
Author: Tom Peters <thopeter@cisco.com>
Date:   Tue Jun 23 13:35:10 2020 -0400

    http_inspect: script detection

Merge pull request #2414 in SNORT/snort3 from ~KATHARVE/snort3:file_upload_fix to master

Squashed commit of the following:

commit 6dd1edc686aabf6e1803eb1803b3e67856f3385b
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Aug 11 16:53:17 2020 -0400

    http_inspect: don't use the URL to cache file verdicts for uploads

Merge pull request #2413 in SNORT/snort3 from ~MMATIRKO/snort3:update_proto to master

Squashed commit of the following:

commit 319ee476aba2c0a07accbea66c720d66230e7bef
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Wed Aug 19 16:21:28 2020 -0400

    rna: add protocols on logging host trackers

Merge pull request #2400 in SNORT/snort3 from ~RDEMPSTE/snort3:deferred_whitelist to master

Squashed commit of the following:

commit dcd0bdfa212159b0cf8862084a8c55a7ff1c870d
Author: rdempste <rdempste@cisco.com>
Date:   Mon Aug 3 20:15:57 2020 -0400

    flow: add a deferred trust class to allow plugins to defer trusting sessions

commit 5c5a962ff08973d70c9f0a29bd0aca1c3476a974
Author: rdempste <rdempste@cisco.com>
Date:   Thu Jul 23 13:26:31 2020 -0400

    managers: immediately stop executing inspectors when inspection is disabled

commit ac5e78590bdd8a8ef494077443423b1fa49c7f85
Author: rdempste <rdempste@cisco.com>
Date:   Thu Jul 23 13:28:26 2020 -0400

    packet_io: do not allow trust unless the action is allow or trust

commit 5e0c38db8d8ac762068be67677c409c9f183d2ca
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Wed Aug 19 15:22:28 2020 -0400

    active: remove per packet prevent trust action

Merge pull request #2378 in SNORT/snort3 from ~DERAMADA/snort3:imap_start_tls to master

Squashed commit of the following:

commit 95d294d06fb2a600f354dd2bd979d38bdf4bc590
Author: deramada <deramada@cisco.com>
Date:   Tue Aug 4 23:39:42 2020 -0400

    imap: publish OPPORTUNISTIC_TLS_EVENT on successfull completion on START_TLS,
    add a new state to avoid publishing start_tls events multiple times

Merge pull request #2382 in SNORT/snort3 from ~SVLASIUK/snort3:dump_config_json to master

Squashed commit of the following:

commit bcba018627626465fbb8f55dacab8a6856690da3
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Thu Aug 6 14:34:18 2020 +0300

    dump_config: dump config in JSON format to stdout

    add new command-line option --dump-config=all to dump
    the config in JSON format

commit 67b5defe6f7a132ff62d2bd278364476cefe372c
Author: Oleksii Khomiakovskyi <okhomiak@cisco.com>
Date:   Wed Aug 5 17:13:33 2020 +0300

    helpers: add unit tests for special characters escaping

Merge pull request #2408 in SNORT/snort3 from ~KBHANDAN/snort3:whd_reload to master

Squashed commit of the following:

commit ffbbe26f3beb7a46b5bd3b9f2b28d3a2b8092a7a
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Tue Aug 18 08:56:11 2020 -0400

    flow: reset the flow before removing

Merge pull request #2401 in SNORT/snort3 from ~MMATIRKO/snort3:mac_timeout to master

Squashed commit of the following:

commit 6cdb8b1ff4a15f420a065ec4bd8b5d5dc8d24eed
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Wed Aug 12 15:58:20 2020 -0400

    rna: implement update_timeout for MAC hosts

Merge pull request #2393 in SNORT/snort3 from ~BBANTWAL/snort3:configure_errors to master

Squashed commit of the following:

commit f33220aa45f185a56161d5f0520c266cc5f7015e
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Aug 10 23:05:17 2020 -0400

    perf_monitor: convert the perf_monitor inspector configure warnings to errors

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

Squashed commit of the following:

commit 70794b1821aa7cad2fcdd391335d8fd1eaff0ec9
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Thu Jun 25 07:48:51 2020 -0400

    packet_io: Added reason for ActiveStatus WOULD

Merge pull request #2392 in SNORT/snort3 from ~KAMURTHI/snort3:reload_socket_message to master

Squashed commit of the following:

commit 13b0cba150d950d2305490c592328f1fb1a443ff
Author: kamurthi <kamurthi@cisco.com>
Date:   Mon Aug 10 22:02:53 2020 -0400

    appid: send swap response for reload_odp and reload_third_party commands in control thread

Merge pull request #2390 in SNORT/snort3 from ~DIPANDIT/snort3:file_max_limit to master

Squashed commit of the following:

commit b8b040ea98f52b3cae6d21e1e7da9be61d796d84
Author: dipto <dipandit@cisco.com>
Date:   Mon Aug 10 03:15:29 2020 -0400

    file_api: Increase default max_files_per_flow limit to 128

Merge pull request #2397 in SNORT/snort3 from ~MSTEPANE/snort3:3_0_2_build_5 to master

Squashed commit of the following:

commit b8a7c1a62f1b24a9bcbf17fd88231c797d5ba02d
Author: Mike Stepanek <mstepane@cisco.com>
Date:   Wed Aug 12 07:45:23 2020 -0400

    build: Generate and tag 3.0.2 build 5

Merge pull request #2370 in SNORT/snort3 from ~EBURMAI/snort3:dce_whitelisting to master

Squashed commit of the following:

commit 0228761ba8943f344b49d26197926b9c6f28ea68
Author: Eduard Burmai <eburmai@cisco.com>
Date:   Mon Aug 3 11:24:33 2020 -0400

    dce_tcp: set dce_tcp as a control channel inspector

Merge pull request #2386 in SNORT/snort3 from ~SBAIGAL/snort3:ftps to master

Squashed commit of the following:

commit 24e1fa41a6b82bc793fe90015a160ac6842876a7
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Thu Jul 23 15:38:58 2020 -0400

    ftp: add opportunistic TLS support

Merge pull request #2387 in SNORT/snort3 from ~THOPETER/snort3:h2i_finish to master

Squashed commit of the following:

commit ad37a366a1f2414c0cefee09292cd349dfce9ada
Author: Tom Peters <thopeter@cisco.com>
Date:   Wed Aug 5 16:56:38 2020 -0400

    http_inspect: finish() after partial inspection

Merge pull request #2391 in SNORT/snort3 from ~MDAGON/snort3:h2i_flushfix to master

Squashed commit of the following:

commit 4bbaa007fda17fc80179f3713d71e505a1a7cd4e
Author: mdagon <mdagon@cisco.com>
Date:   Mon Aug 10 08:52:06 2020 -0400

    http2_inpsect: fix for flush on data frame boundray w/o end of stream

Merge pull request #2389 in SNORT/snort3 from ~MASHASAN/snort3:rna_proto to master

Squashed commit of the following:

commit e0f9fad3d3ba658ee4af9e1eae02cfc4f791f97a
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Aug 7 19:19:03 2020 -0400

    rna: Discover network and transport protocols

Merge pull request #2373 in SNORT/snort3 from ~OSERHIIE/snort3:help_modules_json to master

Squashed commit of the following:

commit 87484e324090b3d0baa60e5a51bb4f8bc0743890
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Mon Aug 3 23:00:45 2020 +0300

    cip: fix the trailing parameter for the module

commit 31bdafe40d97c6b6a37b23fda5c140ebc3c170f8
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Tue Jul 28 23:34:13 2020 +0300

    main: add printing modules help in JSON format

        * main: new CLI option '--help-modules-json' is presented
        * main: add support for HelpType HT_HMO_JSON
        * framework: add API to expand maxN literals for ranges in Parameter
        * managers: add JSON dumpers into ModuleManager
        * managers: rename 'What' -> 'Help' in the output of '--help-module' CLI option

commit 87139f76fa31f68a1b796206e6201afb752d9bb6
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Tue Jul 28 17:18:54 2020 +0300

    helpers: extend printed JSON syntax

        * anonymous arrays (root arrays)
        * JSON keywords (null, true, false)
        * printing values of floating point type

Merge pull request #2339 in SNORT/snort3 from ~MMATIRKO/snort3:rna_mac to master

Squashed commit of the following:

commit 10b80bae582fe4fc391b26f06cd57f8e90fc5a7d
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Wed Jun 24 16:13:31 2020 -0400

    Add RNA MAC-based discovery logic

Merge pull request #2375 in SNORT/snort3 from ~DAVMCPHE/snort3:stream_tcp_cleanup_only_once to master

Squashed commit of the following:

commit 8cb61ff4d038c75c12b099cb85bb9b48a7ff782e
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Tue Aug 4 07:38:45 2020 -0400

    stream_tcp: add check to prevent reentry to TCP session cleanup when flushing a pdu

Merge pull request #2374 in SNORT/snort3 from ~BBANTWAL/snort3:set_binding_updates to master

Squashed commit of the following:

commit 00890069e6d8e1a12b4279f8baabf27cf6e0b346
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Jul 30 16:04:11 2020 -0400

    managers: print the instance type of the inspector module with --help-module

commit 25e31ddc1f33ba26a9ee12f8b1cd7e9dd67b1036
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Jul 30 16:03:38 2020 -0400

    framework: add an api to check if the module can be bound in the binder

Merge pull request #2379 in SNORT/snort3 from ~RUCOMBS/snort3:tcp80 to master

Squashed commit of the following:

commit eb76760da445e01a1037f4cb6d45aaec3ba6568d
Author: russ <rucombs@cisco.com>
Date:   Wed Aug 5 09:03:12 2020 -0400

    lua: add tcp port 80 binding to the connectivity and balanced tweaks

Merge pull request #2357 in SNORT/snort3 from ~KATHARVE/snort3:ftp to master

Squashed commit of the following:

commit 0eb90fd685dadea3a9857e130e5b73fdc4e425f4
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Jul 14 15:03:59 2020 -0400

    ftp: fix direction for active data transfers;
    flow: check expected flows in flow control and add direction swap flag to expected flows

Merge pull request #2367 in SNORT/snort3 from ~MSTEPANE/snort3:3_0_2_build_4 to master

Squashed commit of the following:

commit 70e0c1d9a7e51c6f5edbd3b734bb9b68e36e8523
Author: Mike Stepanek <mstepane@cisco.com>
Date:   Fri Jul 31 08:12:24 2020 -0400

    build: generate and tag 3.0.2 build 4

Merge pull request #2371 in SNORT/snort3 from ~SATHIRKA/snort3:odp_reload_dynamic_cache to master

Squashed commit of the following:

commit c8fd1962f309aaa6fae49b0b437404e04adb0e8a
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Mon Aug 3 15:25:33 2020 -0400

    appid: Clear service appid entries in dynamic host cache on ODP reload

Merge pull request #2377 in SNORT/snort3 from ~DIPANDIT/snort3:smb_cleanup_issue to master

Squashed commit of the following:

commit a95dd780fea35355517468baedc519ae5e6c0c2f
Author: dipto <dipandit@cisco.com>
Date:   Wed Aug 5 10:49:23 2020 -0400

    dce_rpc: fix for smb crash while tcp session pruning

Merge pull request #2376 in SNORT/snort3 from ~THOPETER/snort3:nhttp147 to master

Squashed commit of the following:

commit 065b7738aaf7712fba8275f0cd83519bd79a232d
Author: Tom Peters <thopeter@cisco.com>
Date:   Mon Aug 3 15:05:23 2020 -0400

    http_inspect: test tool enhancement

Merge pull request #2372 in SNORT/snort3 from ~NEHASH4/snort3:final_smb_changes to master

Squashed commit of the following:

commit 8d9dafa0addf0eab367debd9007efcd5bb5cea67
Author: Neha Sharma <nehash4@cisco.com>
Date:   Fri Jul 31 13:02:58 2020 -0400

    dce_rpc: fix for smb session cleanup issue

Merge pull request #2366 in SNORT/snort3 from ~SVLASIUK/snort3:doc_dump_config to master

Squashed commit of the following:

commit 31cb87855ea7b8e86d56f49b44a0b9125f15743a
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Tue Jul 28 13:45:46 2020 +0300

    doc: add documentation for dumping consolidated config in text format

Merge pull request #2360 in SNORT/snort3 from ~NEHASH4/snort3:smb_change_file_id to master

Squashed commit of the following:

commit 9a408d06891c409da736cb3577c4496173f37120
Author: Neha Sharma <nehash4@cisco.com>
Date:   Wed Jul 29 13:51:12 2020 -0400

    dce_rpc: use file name hash as file id

Merge pull request #2356 in SNORT/snort3 from ~NEHASH4/snort3:flow_fix to master

Squashed commit of the following:

commit 6b6d8d037c4ab324336eaad20011f4c4de9a337b
Author: Neha Sharma <nehash4@cisco.com>
Date:   Wed Jul 29 07:26:25 2020 -0400

    flow: fixing free_flow_data logic

Merge pull request #2334 in SNORT/snort3 from ~SVLASIUK/snort3:dump_config_text to master

Squashed commit of the following:

commit 252af2d5de8f3b68bd43e649e49d11a7c7bb742b
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Fri Jul 3 15:25:57 2020 +0300

    main: dump consolidated config in the text format

Merge pull request #2364 in SNORT/snort3 from ~SHRARANG/snort3:appid_dns_event to master

Squashed commit of the following:

commit 70f3556fd38a9414e77ae2c752284ab25b174eec
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Thu Jul 30 15:06:55 2020 -0400

    appid: generate event notification when dns host is set

Merge pull request #2365 in SNORT/snort3 from ~THOPETER/snort3:nhttp145 to master

Squashed commit of the following:

commit c26ca80f1680939468e9b55518c2a37eb7440da0
Author: Tom Peters <thopeter@cisco.com>
Date:   Thu Jul 30 17:39:46 2020 -0400

    http2_inspect: cleanup

Merge pull request #2361 in SNORT/snort3 from ~DAVMCPHE/snort3:host_attribute_peg_counts to master

Squashed commit of the following:

commit 3c8c6ce0fbce7fc2810698bfae92053444f27c7f
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Jul 29 15:18:36 2020 -0400

    utils: keep deprecated attribute table pegcounts

Merge pull request #2354 in SNORT/snort3 from ~MASHASAN/snort3:fix_ut_warning to master

Squashed commit of the following:

commit 582e004954e2ac17d048e8f2d586d76987bc2161
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Jul 28 18:12:01 2020 -0400

    rna: Fix redefined macro warnings in between unit-test tools

Merge pull request #2355 in SNORT/snort3 from ~SMINUT/snort3:tcp_fp_io_utests to master

Squashed commit of the following:

commit 5828d286745205da9201466f9f09fd2ba609f8b2
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Jul 28 14:03:44 2020 -0400

    rna: tcp fingerprint input and retrieval

Merge pull request #2352 in SNORT/snort3 from ~NENEHA/snort3:3_0_2_build_3 to master

Squashed commit of the following:

commit 0ee42eafd1626a78289220433bcf9dbd9768e208
Author: Neha Neha <neneha@cisco.com>
Date:   Tue Jul 28 13:31:21 2020 -0400

    build: generate 3.0.2 build 3

Merge pull request #2343 in SNORT/snort3 from ~MDAGON/snort3:translate to master

Squashed commit of the following:

commit 0c98ff023f2575ab3a36c8b09c6fa62de234913f
Author: mdagon <mdagon@cisco.com>
Date:   Fri Jul 10 11:25:18 2020 -0400

    payload_injector: add HTTP page translation

Merge pull request #2329 in SNORT/snort3 from ~OSHUMEIK/snort3:policy_custom_variables to master

Squashed commit of the following:

commit a0f0b195faee442a2ee63fec1e8bdf20e1b29966
Author: Oleksii Khomiakovskyi <okhomiak@cisco.com>
Date:   Mon Jul 6 17:23:23 2020 +0300

    ips: add support for variables with each ips policy

    Custom variables are for rules only.
    Snort2lua creates custom variables for each ips entry.

Merge pull request #2332 in SNORT/snort3 from ~MDAGON/snort3:inj_h2i to master

Squashed commit of the following:

commit 01d5bf727cb31e8c6ed1e6670a097909ec90d903
Author: mdagon <mdagon@cisco.com>
Date:   Mon Jul 6 13:56:57 2020 -0400

    payload_injector: extend utility to support http2 (no injection)

Merge pull request #2344 in SNORT/snort3 from ~SATHIRKA/snort3:odp_reload to master

Squashed commit of the following:

commit 69b00850064d2f9c30fd53045690ac6c925edeb9
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Fri Jul 17 16:45:32 2020 -0400

    appid: Support ODP reload for multiple packet threads and new session