Merge pull request #1496 in SNORT/snort3 from ~STECHEW/snort3:splitter_scan to master

Squashed commit of the following:

commit 891499867ff983216f15e6d96b972046aba69c92
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Jan 30 21:52:24 2019 +0530

    stream: Pass Packet in flush_pdu_* -> paf_eval -> paf_callback chain.

commit f1b109aff3032302542e33b3c3c4213d254a4f9e
Author: Steve Chew <stechew@cisco.com>
Date:   Tue Jan 29 02:13:40 2019 +0530

    stream: Change StreamSplitter::scan to take a Packet instead of a Flow.

Merge pull request #1506 in SNORT/snort3 from ~MIREDDEN/snort3:port_scan_memcap_reload to master

Squashed commit of the following:

commit ceccbcae1fc77038787c320f7e422607960ec0c4
Author: Mike Redden <miredden@cisco.com>
Date:   Tue Feb 5 13:07:44 2019 -0500

    port_scan: Fail reload if memcap changed

Merge pull request #1505 in SNORT/snort3 from ~MDAGON/snort3:clean to master

Squashed commit of the following:

commit defc62939f9af82d37f3460815bb1d61a5c25dfa
Author: Maya Dagon <mdagon@cisco.com>
Date:   Tue Jan 29 15:21:48 2019 -0500

    reload: differentiate between restart required and bad config

Merge pull request #1483 in SNORT/snort3 from ~BBANTWAL/snort3:batching to master

Squashed commit of the following:

commit ecb607e1f70f760b545101a4dfa687f184aa2c36
Author: Jonathan McDowell <j.mcdowell@titan-ic.com>
Date:   Wed Jan 9 14:36:35 2019 +0000

    detection: Add search batching infrastructure

    Batch jobs for submission in fp_detect, allowing for a single
    submission of related buffers in the MPSE. Add a generic search_batch()
    which just calls search() for each MPSE instance, and a
    receive_responses() to provide initial infrastructure for asynchronous
    operation.

Merge pull request #1497 in SNORT/snort3 from ~MIREDDEN/snort3:fix_sticky_buffer_duplicates to master

Squashed commit of the following:

commit 91637b20ce8f365061a607e9233b1a239629fc72
Author: Mike Redden <miredden@cisco.com>
Date:   Mon Jan 28 17:10:32 2019 -0500

    snort2lua: fix sticky buffer duplication

Merge pull request #1494 in SNORT/snort3 from ~MDAGON/snort3:cppcheck_dce to master

Squashed commit of the following:

commit eea8e7ac7f6a630838ee3968f6f91c5569821152
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 13:58:54 2018 -0500

    dce_rpc: fix cppcheck warnings

Merge pull request #1493 in SNORT/snort3 from ~SMINUT/snort3:ips_file_type to master

Squashed commit of the following:

commit 6c2e6330bb957da3783c47a1406ecebb479af7cf
Author: Silviu Minut <sminut@cisco.com>
Date:   Wed Jan 23 09:25:26 2019 -0500

    ips_options: implement FileTypeOption::hash() and FileTypeOption::operator==(), inherited from IpsOption, using the types bitset array, in order to distinguish between different file type options.

    ips_options: change strncmp to plain strcmp per reviewers' comments.

Merge pull request #1491 in SNORT/snort3 from ~MASHASAN/snort3:dce_alert_once to master

Squashed commit of the following:

commit a8c8665b06181ab0dad9979787d2455d2e1b1731
Author: Masud Hasan <mashasan@cisco.com>
Date:   Thu Jan 17 15:31:35 2019 -0500

    dce_rpc: Limiting each signature alert to once per session using 'limit_alerts' config

Merge pull request #1495 in SNORT/snort3 from ~CWAXMAN/snort3:snort2lua_dups to master

Squashed commit of the following:

commit 23c4095f92f55477ca250c1c458893c77ca7e739
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Jan 24 12:30:33 2019 -0500

    snort2lua: fixed duplication of split_any_any from config: detection

Merge pull request #1488 in SNORT/snort3 from ~KETJEN/snort3:lru_cache_changes to master

Squashed commit of the following:

commit a46e75f30321724c22d3cb9d47e362664c60c029
Author: ketjen <ketjen@cisco.com>
Date:   Fri Jan 11 18:58:32 2019 -0800

    hash: Added lru_cache_shared.h to HASH_INCLUDES

commit 5fbf496e9ecffd0e4b5d8d6e511b2c210f6b3e74
Author: ketjen <ketjen@cisco.com>
Date:   Fri Jan 11 18:58:00 2019 -0800

    hash: Moved list_iter assignment inside to avoid improper memory access
    in LruCacheShared

Merge pull request #1490 in SNORT/snort3 from ~NIHDESAI/snort3:ips_react to master

Squashed commit of the following:

commit c546889b75822e38c68016f430fd66e4bdb92356
Author: Nihal Desai <nihdesai@cisco.com>
Date:   Wed Jan 16 12:27:18 2019 -0500

    react: sending reset to server only

Merge pull request #1487 in SNORT/snort3 from ~MDAGON/snort3:packet_thread_start to master

Squashed commit of the following:

commit 1e58687aaa264f82289d73c5bbc69f9c14aeccbc
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Jan 9 16:13:18 2019 -0500

    main: log message when all pthreads started (REG_TEST only)

Merge pull request #1478 in SNORT/snort3 from ~SMINUT/snort3:sd_obfuscate to master

Squashed commit of the following:

commit 06ea21618014ce4b352ace310b1efeeabbc16129
Author: Silviu Minut <sminut@cisco.com>
Date:   Mon Jan 7 00:11:48 2019 -0500

    main: move obfuscate_pii from OutputModule to IpsModule.

    main: move the obfuscate parameter from IpsModule back to OutputModule, per reviewers' comments.

    snort2lua: move obfuscate_pii to the ips table from the output table.

Merge pull request #1485 in SNORT/snort3 from ~SMINUT/snort3:rate_filter to master

Squashed commit of the following:

commit 53bd9d1b460654243172c7e253eec8ca422f262a
Author: Silviu Minut <sminut@cisco.com>
Date:   Thu Jan 10 17:17:14 2019 -0500

    filters: call get_ips_policy instead of get_network_policy when building the key for rate filter.

Merge pull request #1484 in SNORT/snort3 from ~SBAIGAL/snort3:ignore_flow_fix to master

Squashed commit of the following:

commit b8a616d3813c26199ca5e216678498e71b31dba8
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Thu Jan 10 14:47:37 2019 -0500

    stream: fixed ignore_flow segfault bug caused by allocating generic flow data instead of inspector specific flow data

Merge pull request #1470 in SNORT/snort3 from ~PSHINDE2/snort3:lua_detector_crash to master

Squashed commit of the following:

commit 5ec05000ce2d077cf9482ef8f5ff3c32ff72d3b7
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Thu Jan 10 13:15:10 2019 -0500

    config: Use basename_r() function for FreeBSD versions < 12.0.0

Merge pull request #1479 in SNORT/snort3 from ~MASHASAN/snort3:socket_crash to master

Squashed commit of the following:

commit ebcfc6b5298aeb1af5dac7570412fa95feeed1a0
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Jan 8 10:16:36 2019 -0500

    control: Avoid deleting objects on write failures so that they get deleted from main thread during read polling

Merge pull request #1481 in SNORT/snort3 from ~MDAGON/snort3:doc_reload_stream to master

Squashed commit of the following:

commit 75e07665a066acdda1ee6301f7b37a6b35a228df
Author: Maya Dagon <mdagon@cisco.com>
Date:   Fri Jan 4 12:29:52 2019 -0500

    doc: update reload limitations - adding/removing stream_*

Merge pull request #1482 in SNORT/snort3 from ~CWAXMAN/snort3:file_race to master

Squashed commit of the following:

commit d9fe7ab30e1daf7033821ff9993c1227bbe1fb9d
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Jan 8 16:35:07 2019 -0500

    file: fixed data race at shutdown

Merge pull request #1480 in SNORT/snort3 from ~MDAGON/snort3:reload_stream_inspectors to master

Squashed commit of the following:

commit cf95a4564e84c4da975a2e9643271678efb91afa
Author: Maya Dagon <mdagon@cisco.com>
Date:   Mon Dec 10 19:17:00 2018 -0500

    reload: fail reload if stream is in the original config and stream_* is added/removed

Merge pull request #1477 in SNORT/snort3 from ~CWAXMAN/snort3:offload_split_fp to master

Squashed commit of the following:

commit 5643bda661db5ac1ae064f3f5f2315dc6b6ec1ac
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Jan 3 13:49:51 2019 -0500

    detection: only swap offload configs when they change

commit 812fda4789424abd6682f3e9d1db49a888509856
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Dec 20 09:12:47 2018 -0500

    detection: split fast pattern processing when using context suspension

Merge pull request #1475 in SNORT/snort3 from ~SBAIGAL/snort3:designated_warnings to master

Squashed commit of the following:

commit 5ec8c4ccbeb006d2975459c1b19c6eb9dee0f881
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Tue Dec 18 13:45:52 2018 -0500

    misc: fixed warnings generated from latest gcc

Merge pull request #1476 in SNORT/snort3 from ~MDAGON/snort3:cppcheck_3 to master

Squashed commit of the following:

commit de59e7f90507b91e9c129bb17b38f276e5f0a83c
Author: Maya Dagon <mdagon@cisco.com>
Date:   Thu Dec 20 12:01:48 2018 -0500

    piglet_plugins: fix cppcheck warnings

commit 494e5fb32b00187bb2b85530223f3c52a10c0580
Author: Maya Dagon <mdagon@cisco.com>
Date:   Thu Dec 20 11:45:06 2018 -0500

    snort2lua: fix cppcheck warning

commit 25e3f25d215c8d85821dfd8260c19f6f2224d0ce
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:25:50 2018 -0500

    ports: fix cppcheck warning

    Fix local variable po_print_buf shadows outer variable

commit 971e72fc949aad1377b1a2b5a2bda5da88ee938c
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:17:52 2018 -0500

    stream: fix for non-boolean value returned

commit ff8c2f913d49f43e78b2a4c4ad6f30593feec895
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:14:07 2018 -0500

    tcp_connector: fix cppcheck warning

    Fix Local variable tcp_connector shadows outer variable

commit 6581af2400c71ac6dc60b4848c2006809bf47014
Author: Maya Dagon <mdagon@cisco.com>
Date:   Wed Dec 19 16:09:41 2018 -0500

    file_connector: fix cppcheck warning

    Fix for local variable file_connector shadows outer variable

build: Alpine Integration -clear segfault in cpputest on musl/Alpine (#71)

* build: Alpine Integration -clear segfault in cpputest on musl/Alpine

Merge pull request #1474 in SNORT/snort3 from ~MIALTIZE/snort3:libiconv to master

Squashed commit of the following:

commit a8eb059f7fff6a3c91c5741dcc40a9404af864cd
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Dec 20 11:53:23 2018 -0500

    build: Add better support for libiconv on systems with iconv-providing libc

Merge pull request #1469 in SNORT/snort3 from ~DDAHIPHA/snort3:flow_for_first_packet to master

Squashed commit of the following:

commit a1cbb6c73750dd9b9f3225fae17d4c34018a1fdf
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Fri Dec 14 18:31:19 2018 -0500

    snort_config: Add a setter for setting run_flags and set it to TRACK_ON_SYN for hs_timeout config

Merge pull request #1472 in SNORT/snort3 from ~MDAGON/snort3:cppcheck_fix to master

Squashed commit of the following:

commit 2833fb3255ead1286dd8d4966d5990ef028c12ce
Author: Maya Dagon <mdagon@cisco.com>
Date:   Tue Dec 18 11:44:10 2018 -0500

    dce_rpc: fix style warning non-boolean returned

commit a2a70a56988806fa47749fff1258c153f3528f3f
Author: Maya Dagon <mdagon@cisco.com>
Date:   Tue Dec 18 11:19:19 2018 -0500

    protocols: fix style warning non-boolean value returned

Merge pull request #1465 in SNORT/snort3 from ~CWAXMAN/snort3:offload_context_deps to master

Squashed commit of the following:

commit e8c4313927cb73dbca52471a461c129c18460ac2
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Dec 7 07:29:50 2018 -0500

    Mpse: fixed build warning about constness of get_pattern_count

commit 4d3aa71ec4fc7130073aad4ed143407b7c656f6a
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Dec 6 16:29:02 2018 -0500

    Flow: is_offloaded is now is_suspended

commit c8fddc2d61843ad1ff41e1ea721dea890007ff0b
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Dec 6 09:12:27 2018 -0500

    IpsContext: removed useless SUSPENDED_OFFLOAD state

commit ec47d206b928baa3f9c97364980cf99a06f804c1
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Dec 5 15:07:33 2018 -0500

    Packet: fixed thread safety in onload flag checks

commit 8e6969234e2f1ba4d62522938342c1909b21c810
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Dec 5 15:30:11 2018 -0500

    RegexOffload: onload whatever is ready

commit 59618c74d8a449128c82d4bddb0b2399ea77630b
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Dec 6 16:52:37 2018 -0500

    DetectionEngine: make onload safe for reentrance

commit fe186cabc5d0632af8c0555bed88f33529f7fa45
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Dec 6 10:52:25 2018 -0500

    DetectionEngine: stall when out of contexts

commit 3250b20edbe279daa5d22c50381fbe6fbeaaefc0
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Dec 5 16:52:59 2018 -0500

    fp_detect: suspend instead of onload if fp_local can't occur yet

commit dbee8b9c10be69e771d0206944f485cab2077cb7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Nov 29 13:26:14 2018 -0500

    detection: allow suspension of entire chains of contexts

Merge pull request #1468 in SNORT/snort3 from ~SMINUT/snort3:http_malware to master

Squashed commit of the following:

commit 4078b6ab63ded28e096cf582027f9829b6d01de1
Author: Silviu Minut <sminut@cisco.com>
Date:   Wed Dec 12 15:30:04 2018 -0500

    file_api: call FileContext::set_file_name() from FileFlows::set_file_name with fname = nullptr, in order to generate file event.

Merge pull request #1471 in SNORT/snort3 from ~MIREDDEN/snort3:fix_pcre_option_issues to master

Squashed commit of the following:

commit d38bac13658a876f43dda17e1164eae506ec3cd0
Author: Mike Redden <miredden@cisco.com>
Date:   Tue Dec 18 08:56:50 2018 -0500

    snort2lua: fix pcre option issues

Merge pull request #1467 in SNORT/snort3 from ~MIREDDEN/snort3:snort2lua_dev_notes2 to master

Squashed commit of the following:

commit 93214fa1456a19a10e06747b67a0fbb37a1988d9
Author: Mike Redden <miredden@cisco.com>
Date:   Fri Dec 14 16:05:44 2018 -0500

    snort2lua: Create dev_notes.txt for sticky buffers

Merge pull request #1462 in SNORT/snort3 from ~SBAIGAL/snort3:stream_cache_reload to master

Squashed commit of the following:

commit 8187840a9cb93c782451c6dab1662e352226e3bc
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Mon Dec 10 10:40:12 2018 -0500

    reload: prompt reload failure and require restart when stream cache were changed

Merge pull request #1463 in SNORT/snort3 from ~CWAXMAN/snort3:offload_actions to master

Squashed commit of the following:

commit 7647547294400c2572f0eef9d6f9f98e8fff5ef3
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Dec 12 09:11:36 2018 -0500

    ActionManager: actions are tracked per packet for accurate packet suspension

Merge pull request #1460 in SNORT/snort3 from ~MDAGON/snort3:file_reload to master

Squashed commit of the following:

commit 9af61b0b8f0f41516123d018d94cb21f710f2944
Author: mdagon <mdagon@cisco.com>
Date:   Wed Oct 31 15:38:00 2018 -0400

    file_api: fail the reload if max_files_cache is changed  or if capture was initially enabled and capture_memcap or capture_block_size change

Merge pull request #1461 in SNORT/snort3 from ~DERAMADA/snort3:ips_binder to master

Squashed commit of the following:

commit 4b6aed33ddd66eb0283cae99872b200b019971fe
Author: deramada <deramada@cisco.com>
Date:   Mon Dec 10 15:29:41 2018 -0500

    binder: store user set ips policy id from lua

Merge pull request #1457 in SNORT/snort3 from ~MDAGON/snort3:doc_reload to master

Squashed commit of the following:

commit 5989f0abb312c7ec72db512945f6bc4635963013
Author: Maya Dagon <mdagon@cisco.com>
Date:   Fri Nov 30 16:20:04 2018 -0500

    doc: add a section for reload limitations

Merge pull request #1459 in SNORT/snort3 from ~MASHASAN/snort3:file_nullptr_check to master

Squashed commit of the following:

commit 5e8dbe1f9b5b74ddb6a4991790a533f16c22c953
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Dec 7 15:10:13 2018 -0500

    file_api: Added nullptr checking to prevent segfaults when file mempool is not configured

build: Generate and tag build 250

perf_monitor: Actually allow building perf_monitor as a dynamic plugin

Merge pull request #1455 in SNORT/snort3 from ~VIROEMER/snort3:fix-appid-detector-builder-install to master

Squashed commit of the following:

commit 394acabaa5efff66a8cea0e4d3d833b4e143d0b9
Author: Victor Roemer (viroemer) <viroemer@cisco.com>
Date:   Wed Dec 5 18:54:07 2018 -0500

    tools: Install appid-detector-builder.sh with the other tools.

    appid-detector-builder.sh was being installed to the temporary CMake
    working directory and this is caught by bitbake which errors.

Merge pull request #1452 in SNORT/snort3 from ~RUCOMBS/snort3:int_types to master

Squashed commit of the following:

commit 927335a9d770afd3f976c5d433dfbf59c358f1d3
Author: russ <rucombs@cisco.com>
Date:   Sat Dec 1 09:08:48 2018 -0500

    build: clean up additional warnings

commit 237dc040cedf560fa2e10127c5db9cf6b313fd8c
Author: russ <rucombs@cisco.com>
Date:   Fri Nov 30 14:54:58 2018 -0500

    build: fix some int format specifiers

commit bd1b6a63ed81d99dcec9404bdf08a886d04acf48
Author: russ <rucombs@cisco.com>
Date:   Fri Nov 30 14:22:37 2018 -0500

    build: fix some int type conversion warnings

commit 489e5ce892199bef55974bbd1b85281fd1e1c453
Author: russ <rucombs@cisco.com>
Date:   Fri Nov 30 08:17:16 2018 -0500

    parameter: remove arbitrary one day limit on timers

commit dadfae41cc9e2cc73809688de593f93b9d4e6a20
Author: russ <rucombs@cisco.com>
Date:   Thu Nov 29 08:46:55 2018 -0500

    snort: add --help-limits to output max* values

commit 8886dbaec359e974b016d5f33e50fd75a62722ef
Author: russ <rucombs@cisco.com>
Date:   Thu Nov 29 07:50:07 2018 -0500

    parameter: add maxSZ upper bound for int sizes

commit 4d29c63de0c65315f3cfb7c30d63604366369095
Author: russ <rucombs@cisco.com>
Date:   Wed Nov 28 13:39:16 2018 -0500

    parameter: add max31, max32, and max53 for int upper bounds

commit 25c837adb622de44ea746d8081498b4a3c3e3d7a
Author: russ <rucombs@cisco.com>
Date:   Tue Nov 27 08:27:05 2018 -0500

    spelling: fix typo, disable checks on test data

commit acca70d032f3de0ca5e3ca0ef4e80dbd2199d743
Author: russ <rucombs@cisco.com>
Date:   Mon Nov 26 22:46:47 2018 -0500

    parameter: clean up some signed/unsigned mismatches

commit f0d5e1a033ccf16a57af6551f098bb43adf19fdd
Author: russ <rucombs@cisco.com>
Date:   Mon Nov 26 17:37:52 2018 -0500

    parameter: remove ineffective -1 from pcre_match_limit*

commit f52729f59324519be52a0058fbe3c104bb056783
Author: russ <rucombs@cisco.com>
Date:   Mon Nov 26 12:03:55 2018 -0500

    parameter: use bool instead of int for bools

commit c845621d7900f97da697a966b4b2fe8af9008614
Author: russ <rucombs@cisco.com>
Date:   Mon Nov 26 11:44:57 2018 -0500

    parameter: use consistent default port ranges

commit ab3be3c2121bb9a2f89f65ed3712eb5f5f68046b
Author: russ <rucombs@cisco.com>
Date:   Mon Nov 26 08:32:20 2018 -0500

    parameter: clean up upper bounds

commit 78aaf9fc08d6b05e8949426eace6a83e06f731ea
Author: russ <rucombs@cisco.com>
Date:   Fri Nov 23 10:52:57 2018 -0500

    parameter: build out validation unit tests

commit ed4235ab439d1966e645378f97fd079672329091
Author: russ <rucombs@cisco.com>
Date:   Fri Nov 23 09:16:35 2018 -0500

    perf_monitor: fix benign parameter errors

commit bfcbb47e5c01608532df3308cf2e684c5e06b6dc
Author: russ <rucombs@cisco.com>
Date:   Fri Nov 23 09:14:57 2018 -0500

    parameter: reorgranize for unit tests

Merge pull request #1451 in SNORT/snort3 from ~MASHASAN/snort3:si_blacklist_event to master

Squashed commit of the following:

commit e4e65594c38b3c1aec8e530037a89b1d1a2b896a
Author: Masud Hasan <mashasan@cisco.com>
Date:   Wed Nov 28 22:07:18 2018 -0500

    reputation: Fix iterations of layers for different nested_ip configs and show the blacklisted IP in events

Merge pull request #1454 in SNORT/snort3 from ~MIALTIZE/snort3:preng to master

Squashed commit of the following:

commit 05e0b65ebfc22ce68aada07f94e98442de5e6867
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Oct 9 18:36:25 2018 -0400

    snort: Default to a snaplen of 1518

commit d4e70b104c72b6768dc328fda396d251171707c9
Author: Michael Altizer <mialtize@cisco.com>
Date:   Sat Nov 3 15:03:46 2018 -0400

    module_manager: Fix configuring module parameter defaults when modules have list parameters

commit 9166086ae089c4296be087bb91d02dd761b8b9e0
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Oct 29 10:36:47 2018 -0400

    snort2lua: Fix compiler warning for catching exceptions by value

commit 8ae596426cccfab0c898013e881dfc39f16eba84
Author: Michael Altizer <mialtize@cisco.com>
Date:   Wed Oct 3 14:41:34 2018 -0400

    thread: No more breaks for pigs (union busting)

commit 8cdf8b414bcc153797024c1406369e8389137098
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Aug 31 13:31:11 2018 -0400

    appid: Don't build unit test components without ENABLE_UNIT_TESTS

Merge pull request #1453 in SNORT/snort3 from ~MDAGON/snort3:reload_config to master

Squashed commit of the following:

commit 13980e232f10ab4f289c4ffde26df4170a865ce5
Author: Maya Dagon <mdagon@cisco.com>
Date:   Fri Nov 16 15:10:19 2018 -0500

    file_api: choose whether to get file config from current config or staged one

Merge pull request #1446 in SNORT/snort3 from ~SBAIGAL/snort3:reload_ips_action to master

Squashed commit of the following:

commit 074dfc4ae15200a97300469818c3adc166a9b2ee
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Tue Nov 27 14:00:50 2018 -0500

    reload action: updated action manager to support reload

Merge pull request #1448 in SNORT/snort3 from ~MDAGON/snort3:reload_capture to master

Squashed commit of the following:

commit 1cceb6ad77ec09c409f958aee2535f68ea91f66b
Author: mdagon <mdagon@cisco.com>
Date:   Wed Oct 31 15:38:00 2018 -0400

    file: fail the reload if capture is enabled for the first time

Merge pull request #1447 in SNORT/snort3 from ~DDAHIPHA/snort3:heap_overflow_fix to master

Squashed commit of the following:

commit baa221ddec90f0f3153bfb64bb62c9f5e27fbc02
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Mon Dec 3 09:26:19 2018 -0500

    appid: Fix heap overflow issue for a fuzzed pcap

Merge pull request #1444 in SNORT/snort3 from ~PSHINDE2/snort3:sip_buffer_overflow to master

Squashed commit of the following:

commit 8ff1664addda5eb674ed2cf6db492d3f19feea56
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Tue Nov 27 16:48:39 2018 -0500

    sip: Added sanity check for buffer boundary while parsing a sip message

Merge pull request #1443 in SNORT/snort3 from ~MIREDDEN/snort3:snort2lua_fix_pcre_PH_options_for_sip to master

Squashed commit of the following:

commit 68ae2da5c5ff36675a6aba8f2710ce8327103e15
Author: Mike Redden <miredden@cisco.com>
Date:   Mon Nov 26 14:04:07 2018 -0500

    snort2lua: Fix pcre H and P option conversions for sip

Merge pull request #1442 in SNORT/snort3 from ~CWAXMAN/snort3:offload_kill_stream to master

Squashed commit of the following:

commit 30faa7bb1f3f83b020ce7e5dd8d8c97b5d43f0e2
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Nov 27 14:13:12 2018 -0500

    regex worker: removed assert that didn't handle locks cleanly

commit 2a72bde15e444742d268a04253ae017c40a6eae6
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Nov 26 17:25:46 2018 -0500

    detection, stream: fixed assuming packets were offloaded when previous packets on flow have been offloaded

commit 5a03c7594249291950283c9a05e2a6e85a23dc95
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Nov 21 14:11:02 2018 -0500

    stream tcp: fixed sequence overlap handling when working with empty seglist

commit 30c258f980faef8382623efac34aa44c6e1ff235
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Nov 21 07:35:53 2018 -0500

    stream tcp: fixed applying post-inspection operations to wrong rebuilt packet

Merge pull request #1439 in SNORT/snort3 from ~RUCOMBS/snort3:rule_stubs to master

Squashed commit of the following:

commit bc201990e97b748a9a023687640150b0c1d7274d
Author: russ <rucombs@cisco.com>
Date:   Sat Nov 17 09:32:47 2018 -0500

    so rules: add robust stub parsing

Merge pull request #1445 in SNORT/snort3 from ~RUCOMBS/snort3:extra_issues to master

Squashed commit of the following:

commit fccab4fbc431abbc1857efffe6fa9affb9101100
Author: russ <rucombs@cisco.com>
Date:   Tue Nov 27 18:08:58 2018 -0500

    build: fix come cppcheck warnings:
    Comparison of a boolean expression with an integer other than 0 or 1

commit cac975509d4c9eed8feb212baf7b97d44ffcb767
Author: russ <rucombs@cisco.com>
Date:   Tue Nov 27 18:08:15 2018 -0500

    build: reduce variable scope to address warnings

Merge pull request #1441 in SNORT/snort3 from ~RUCOMBS/snort3:misc_cleanup to master

Squashed commit of the following:

commit e6da3affd41e11f616a61fd8f899f17122d898da
Author: russ <rucombs@cisco.com>
Date:   Wed Nov 21 16:06:27 2018 -0500

    snort: terminate gracefully upon DAQ start failure
    thanks to Jaime González <jaimeglz1952@gmail.com> for reporting the issue

commit 7a53539c715464c6e78f4594332bf55008757058
Author: russ <rucombs@cisco.com>
Date:   Wed Nov 21 15:54:10 2018 -0500

    snort: remove obsolete and inadequate -W option
    thanks to Jaime González <jaimeglz1952@gmail.com> for reporting the issue

commit 9f479de6d021ef49fc456d20dc511525c6cc20e5
Author: russ <rucombs@cisco.com>
Date:   Wed Nov 21 14:12:50 2018 -0500

    snort: fix command line parameters to support setting in Lua
    thanks to  Meridoff <oagvozd@gmail.com> for reporting the issue

file_api: Fix unused variable warning

actions: Fix merge conflict between action objectification and reject action update

Merge pull request #1436 in SNORT/snort3 from ~CWAXMAN/snort3:_offload_context_active to master

Squashed commit of the following:

commit e8de483008ea240e3bc7095c11d552aee1fcd467
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Nov 12 11:01:38 2018 -0500

    active: added peg count for injects

commit 489561ea2fa79a178ea26cf696377741bf7895b0
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Oct 26 09:02:16 2018 -0400

    active, detection: active state is tied to specific packet, not thread

Merge pull request #1440 in SNORT/snort3 from ~SMINUT/snort3:reject_forward_option to master

Squashed commit of the following:

commit 49f47f3950be7b6f9952be1866639a388508e9ec
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Nov 16 15:36:45 2018 -0500

    snort2lua: add code to output control = forward under the reject module.

commit bb5bf4702dc9b7b1673d352700b4b79ad66d5af6
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Nov 16 11:48:42 2018 -0500

    actions: Fixing incorrect order of IPS reject unreachable codes and adding forward option

Merge pull request #1423 in SNORT/snort3 from ~SMINUT/snort3:fuzz_segfault to master

Squashed commit of the following:

commit 680fd0e03fb815f05bcc3862d7486dcb7c88a9a8
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Nov 2 16:19:05 2018 -0400

    protocols: add vlan_idx field to Packet struct and handle multiple vlan type ids. Thanks to ymansour for reporting this issue.

    protocols: change int8 to unit8 for vlan_idx type.

Merge pull request #1430 in SNORT/snort3 from ~BBANTWAL/snort3:offload_non_pdu to master

Squashed commit of the following:

commit 096d510332e2e0b10e46a1668c61e274ce389f35
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Fri Nov 9 13:01:12 2018 -0500

    add check to see if flow is present

commit eaaf991705740d9b3e5a6babd5c1c5bd0c68015e
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Nov 5 13:33:43 2018 -0500

    remove check to see if offload

commit eac33b77422c841034644f9ea2874c01a94b4840
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Nov 5 11:31:51 2018 -0500

    clear context data for raw packets

commit 5fa3d614fcaf1849e7caa0fd0be7d7765c1ee1a7
Author: russ <rucombs@cisco.com>
Date:   Sun Oct 21 10:53:21 2018 -0400

    detection: enable offloading non-pdu packets

Merge pull request #1434 in SNORT/snort3 from ~RUCOMBS/snort3:spelling_nits to master

Squashed commit of the following:

commit bdfd068163c98b1c71436f7df06731197371c6e2
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Nov 14 08:46:41 2018 -0500

    style: clean up comment to reduce spelling exceptions

Merge pull request #1437 in SNORT/snort3 from ~CWAXMAN/snort3:fbs_units to master

Squashed commit of the following:

commit 4dc89f3fe85516316744c1cdebb7ffa9179b4ebe
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Nov 15 08:56:00 2018 -0500

    perfmonitor: fixed fbs schema generation when not building with DEBUG

Merge pull request #1431 in SNORT/snort3 from ~PSHINDE2/snort3:thread_safe_strerror to master

Squashed commit of the following:

commit 577090feb8bd6b33e5031b9c3dfaffd7857e1d84
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Mon Nov 12 11:13:05 2018 -0500

    loggers: Use thread safe strerror_r() instead of strerror()

Merge pull request #1427 in SNORT/snort3 from ~MDAGON/snort3:resume_for_n_2 to master

Squashed commit of the following:

commit 43a577aefa680521ac85217168d9174061bdfe3b
Author: mdagon <mdagon@cisco.com>
Date:   Fri Nov 2 15:57:48 2018 -0400

    main: support resume(n) command

    resume() expanded to support an optional packet number argument.
    When provided, Snort will resume, process n packets and pause.
    In addition pause-after-n updated to support multi packet threads.

Merge pull request #1426 in SNORT/snort3 from ~SBAIGAL/snort3:stream_peg to master

Squashed commit of the following:

commit 596cb6a1f4c2ca9a90869206806b7869003b69fb
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Fri Nov 9 13:17:42 2018 -0500

    stream: fixed stream_base flow peg count sum_stats bug

Merge pull request #1425 in SNORT/snort3 from ~MASHASAN/snort3:databus_clone to master

Squashed commit of the following:

commit 8ba948e060cad592234fc4b0786a0942fec30dde
Author: Masud Hasan <mashasan@cisco.com>
Date:   Thu Nov 1 00:02:28 2018 -0400

    framework: Cloning databus to new config during module reload

Merge pull request #1424 in SNORT/snort3 from ~CWAXMAN/snort3:cmake_generator to master

Squashed commit of the following:

commit f3dd4f7fee75001763a057c9621a918d7c87f9c9
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Nov 8 11:07:17 2018 -0500

    configure_cmake: accept generator names with spaces

Merge pull request #1422 in SNORT/snort3 from ~MSTEPANE/snort3:build_249 to master

Squashed commit of the following:

commit f2e69f3d00b67095834902aebbe3914fe88ef89a
Author: Mike Stepanek <mstepane@cisco.com>
Date:   Wed Nov 7 09:32:23 2018 -0500

    Build 249

Merge pull request #1414 in SNORT/snort3 from perfmon_n_option to master

Squashed commit of the following:

commit 017f98d36281e61b38107fe850a2b148f63c4cc0
Author: Nihal Desai <nihdesai@cisco.com>
Date:   Tue Oct 30 15:42:31 2018 -0400

    perfmon: fix issue for report correct stats after passing -n pkts

Merge pull request #1409 in SNORT/snort3 from reload_fname to master

Squashed commit of the following:

commit a105a63d69690ef36649c21b977a1dab62f14774
Author: mdagon <mdagon@cisco.com>
Date:   Wed Aug 29 18:07:04 2018 -0400

    parser: bad filename during reload is not a fatal error

Merge pull request #1420 in SNORT/snort3 from ~RUCOMBS/snort3:rule_path to master

Squashed commit of the following:

commit 67eff43ab875aeaf441a187c4e5d3c5f4ab3f71e
Author: russ <rucombs@cisco.com>
Date:   Sun Nov 4 09:36:59 2018 -0500

    snort: add --rule-path to load rules from all files under given dir

Merge pull request #1421 in SNORT/snort3 from offload_no_onloads to master

Squashed commit of the following:

commit 08c92b8e71cef3840a11930cb3728ac20d3ac1c3
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Sep 11 14:04:10 2018 -0400

    stream, detection, flow: don't force onloads between pdus unless absolutey necessary

Merge pull request #1417 in SNORT/snort3 from http2gid to master

Squashed commit of the following:

commit 73f557410d0e828718194046dabca9a520739f09
Author: Mike Redden <miredden@cisco.com>
Date:   Thu Nov 1 14:24:37 2018 -0400

    http2_inspect: Change http2 GID from 219 to 121

Merge pull request #1363 in SNORT/snort3 from offload_flow_data to master

Squashed commit of the following:

commit add380fa46f0b167524e656050c279507350f787
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Oct 3 13:12:37 2018 -0400

    stream tcp: don't delete flow data on rst, let session close handle it

Merge pull request #1410 in SNORT/snort3 from invalid_lua_crash to master

Squashed commit of the following:

commit cfc5b686c672418318d44760ea8fdff2a9298e40
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Mon Oct 29 12:27:12 2018 -0400

    appid: Remove detector flows from the list for faulty lua detectors

Merge pull request #1408 in SNORT/snort3 from reload_reputation to master

Squashed commit of the following:

commit d467f58db0d2eb6a8618050bcdf2e48c027c83a9
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Oct 26 14:25:20 2018 -0400

    framework: set the reload_type flags to RELOAD_TYPE_NONE at the end of reload, in anticipation of future reloads.

    reputation: delete old conf before allocating a new one in ReputationModule::begin() if conf not null

    framework: replace the newly introduced loop to reset the reload_type flags with the existing Inspector::update_policy function

Merge pull request #1413 in SNORT/snort3 from bool_emplace to master

Squashed commit of the following:

commit 0bed4caf5b28d7e0a78af7bd4467dad6776632b5
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Oct 30 15:13:37 2018 -0400

    packet_tracer: can't emplace vector<bool> until c++14

Merge pull request #1384 in SNORT/snort3 from perf_hackathon to master

Squashed commit of the following:

commit ec468c4887a072918feb9ada409d538d607ae4cf
Author: Masud Hasan <mashasan@cisco.com>
Date:   Wed Aug 29 22:48:21 2018 -0400

    snort: Code refactoring - replacing push_back/insert by emplace_back/emplace, keeping reputation_id in flow instead of flow_data, and appid code improvements

Merge pull request #1406 in SNORT/snort3 from reload_timestamp to master

Squashed commit of the following:

commit 331a95b730158cc56ffeb6fb8ea24826a78ebe7c
Author: mdagon <mdagon@cisco.com>
Date:   Wed Oct 17 14:53:38 2018 -0400

    thread_idle: call timeout flows with packet time for pcap replay

Merge pull request #1399 in SNORT/snort3 from ring_o_stress to master

Squashed commit of the following:

commit f7f5d5982a329066406bc46b450a53068fd4bcd0
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Oct 22 11:50:40 2018 -0400

    main: size analyzer notification ring appropriately

Merge pull request #1404 in SNORT/snort3 from rule_state to master

Squashed commit of the following:

commit 48d59a5337dfbf07f12ea0bc23183223074a1392
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Oct 25 15:25:37 2018 -0400

    rule_state: indicate list format

Merge pull request #1407 in SNORT/snort3 from ips_context_unit_test_fix to master

Squashed commit of the following:

commit b63007603bd955f92551d3ec4f011e5d22460f30
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Fri Oct 26 13:19:55 2018 -0400

    detection : add function to clear ips_id from unit tests

Merge pull request #1395 in SNORT/snort3 from offload_mime_decode to master

Squashed commit of the following:

commit 3922aab0afd5e880353a70281d166a2d2516de6d
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Tue Oct 23 13:42:17 2018 -0400

    delete commented lines

commit 2cdc9ca78a9527636f566146802c6168d3509436
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Oct 22 15:24:50 2018 -0400

    allocate buffer only once per mime context data

commit d1d11e4e669d38f0c06165e6e1af25c62f6c0704
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Fri Oct 19 14:34:23 2018 -0400

    changes per code review

commit 622759823ffb87f6fabe7f1a381204370463a4a7
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Oct 17 23:45:25 2018 -0400

    mime: move the decode buffer used by mime attachments to mime context data

Merge pull request #1402 in SNORT/snort3 from dce_pragma to master

Squashed commit of the following:

commit 923c3773ec0b12d79f4ffebe49ffd219c5649056
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Oct 24 16:05:29 2018 -0400

    dcerpc: fixed build warning with struct packing

Merge pull request #1403 in SNORT/snort3 from nuke_146 to master

Squashed commit of the following:

commit bf14cb08701526cdba5040dffdf5322b4c67da5e
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Oct 25 12:40:34 2018 -0400

    snort2lua: tweak for style consistency

commit ca3fb174a817679df1f2085c91aacced499d86cc
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Oct 25 12:40:13 2018 -0400

    snort2lua: comment out deleted gid 146 rules

connectors: Fix TCP connector unit test compilation on Alpine Linux (musl)

Merge pull request #1401 in SNORT/snort3 from file_gid to master

Squashed commit of the following:

commit 0b038d5d6442ef1eedffbdddb49413012357797f
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Oct 24 14:19:35 2018 -0400

    file_api: revert deleting gid 146 so existing 146 rulesets dont attempt empty rule eval

Merge pull request #1400 in SNORT/snort3 from fix_static_analyzer_issue to master

Squashed commit of the following:

commit 604156554b3de3c7c92bf98e0fe69212fdb3b566
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Wed Oct 24 10:31:36 2018 -0400

    snort2lua: Avoid returning reference of local variable

Merge pull request #1382 in SNORT/snort3 from config_address_anomaly to master

Squashed commit of the following:

commit e3885a1d1e15a5b8d5749067f0f2201223c50ed1
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Fri Oct 5 15:44:51 2018 -0400

    snort2lua: Enable address_anomaly_detection during snort2lua and fixed missing string sanity checks

Merge pull request #1385 in SNORT/snort3 from iprep_logging_enable_disable to master

Squashed commit of the following:

commit f4d632e843064e7d2d8728ecb39ddc4c87e4e27a
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Tue Oct 23 11:24:57 2018 -0400

    snort2lua: Add support for enable/disable iprep logging using suppress mechanism

Merge pull request #1396 in SNORT/snort3 from appid_profile_race to master

Squashed commit of the following:

commit eacad4b72cda229ee7807f171850f18de3d49c83
Author: Masud Hasan <mashasan@cisco.com>
Date:   Thu Oct 18 09:46:22 2018 -0400

    appid: Fixing profiler data race and registration issues

Merge pull request #1398 in SNORT/snort3 from register_warning to master

Squashed commit of the following:

commit f46580d41a6c6cf9651159e48bc0da02972c68bc
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Oct 22 13:06:33 2018 -0400

    utils: fixed deprecation build warning on register keyword

Merge pull request #1391 in SNORT/snort3 from navl_stats_config to master

Squashed commit of the following:

commit 55d0efe0b33613605cdb1d54e124a2972f01ae7f
Author: Silviu Minut <sminut@cisco.com>
Date:   Thu Oct 11 16:50:57 2018 -0400

    appid: make third party appid stats configurable

Merge pull request #1390 in SNORT/snort3 from flowbit_reload to master

Squashed commit of the following:

commit b18573f72a4fc5665a88369debda99da7b69694b
Author: mdagon <mdagon@cisco.com>
Date:   Mon Oct 8 15:37:13 2018 -0400

    ips_flowbits: move static structures to snort config

Merge pull request #1388 in SNORT/snort3 from fixits to master

Squashed commit of the following:

commit a4d3e3e2137461904b12fd084f2479ced5054b39
Author: russ <rucombs@cisco.com>
Date:   Wed Oct 17 13:55:55 2018 -0400

    comments: additional cleanup

commit 760447cd21cbbad638554361a530637b7a09172a
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Oct 15 10:13:19 2018 -0400

    comments: remove XXX and convert to FIXIT where appropriate

commit e950bb0de085322a28d0d830b321b821164113c2
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Oct 12 21:43:36 2018 -0400

    fixits: prioritize for RC

commit 071538dc340e457c64f151d28527b8b16e86fddf
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Oct 12 21:38:06 2018 -0400

    source: minor refactoring

commit f9bcf0eb3098f2a9b324e5037b83c0915fa5c1ec
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Oct 12 21:32:42 2018 -0400

    comments: fixup format, spelling, priority, etc.

commit ea1dcefeee1e3f280c85e5c38033bb0762c83ee5
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Oct 12 20:49:46 2018 -0400

    build: remove dead code

commit 7a77cb9c3e2e008be8450cae16be7b7ed777cb63
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Oct 12 20:38:26 2018 -0400

    comments: delete obsolete comments

commit b11dfc89c102cd73ef969ff18d86e4fe7c1df8cd
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Oct 12 19:29:00 2018 -0400

    build: support dynamic imap, pop, and smtp

Merge pull request #1394 in SNORT/snort3 from lc_param to master

Squashed commit of the following:

commit 5d3b507bbbc6fe39b2193fc65fa58460bfc12160
Author: Nihal Desai <nihdesai@cisco.com>
Date:   Wed Oct 17 02:24:59 2018 -0400

    host_tracker: fixed uppcase IP param issue

Merge pull request #1389 in SNORT/snort3 from snort2lua_max_pdu to master

Squashed commit of the following:

commit 0980c0545ecaae8fc48fa36cc88f3bb18c20ccd1
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Fri Oct 12 13:11:00 2018 -0400

    snort2lua: fixed paf_max to stream_tcp.max_pdu convertion

Merge pull request #1386 in SNORT/snort3 from cisco-wip to master

Squashed commit of the following:

commit b30a30a659ca307a784bc47d41c815f19e505e2a
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Thu Jul 19 11:27:50 2018 -0400

    detection/http_inspect: Save a snapshot HTTP buffers in the IPS context to support offload of HTTP flows

Merge pull request #1392 in SNORT/snort3 from doc_perf to master

Squashed commit of the following:

commit da4adb4472e8697e21ef9176edd882dbf2a197ed
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Oct 15 14:16:30 2018 -0400

    doc: Adding performance consideration for developers

Merge pull request #1377 in SNORT/snort3 from offload_fp_local to master

Squashed commit of the following:

commit fccd0e722d8087fe57c91e04272793b1aa3f67f8
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Sep 28 15:06:06 2018 -0400

    fp_detect: onload before running local to ensure event ordering

Merge pull request #1376 in SNORT/snort3 from reload_failed_smtp to master

Squashed commit of the following:

commit 2b102d510abec6dee33d07243a35ca5076223f9e
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Wed Sep 26 12:54:15 2018 -0400

    reload: fixed smtp seg fault when reload failed