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

Merge pull request #1374 in SNORT/snort3 from reload_module_fix to master

Squashed commit of the following:

commit 721f5381733609f3fcf65a5689b50323424fd06a
Author: Silviu Minut <sminut@cisco.com>
Date:   Thu Sep 27 11:32:00 2018 -0400

    main: initialize shell_map and other maps in PolicyMap::clone(). Some pointers need to be updated during reloads based on some map lookups, which would fail quietly if those maps are not initialized during clone.

Merge pull request #1378 in SNORT/snort3 from perfmon_segfault to master

Squashed commit of the following:

commit c2e34ca15b12faa98a6e0090fa403d331c0076df
Author: mdagon <mdagon@cisco.com>
Date:   Mon Sep 24 15:08:47 2018 -0400

    perf_monitor: trackers keep copy of the relevant config items from the inspector

Merge pull request #1380 in SNORT/snort3 from mpse_fixes to master

Squashed commit of the following:

commit 55cd4beab52abd873daa6d406d5f25eb44fe9644
Author: russ <rucombs@cisco.com>
Date:   Wed Oct 3 23:11:15 2018 -0400

    cppcheck: cleanup some warnings

commit b9cb8f0e5cde9b036aa8af8d142bb1fd2e564678
Author: russ <rucombs@cisco.com>
Date:   Wed Oct 3 22:35:31 2018 -0400

    search_tool: validate ac_full and ac_bnfa wrt search and search_all

commit 0f30628cd231271c95afb52649719c17134f456c
Author: russ <rucombs@cisco.com>
Date:   Wed Oct 3 19:31:03 2018 -0400

    search_tool: include bytes searched in pattern match stats

Merge pull request #1366 in SNORT/snort3 from offload_dce_endian to master

Squashed commit of the following:

commit 644b30b61449d3d1e08f09e1032e8c3a5ca72421
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Sep 19 16:44:10 2018 -0400

    DCERPC: fixed setting endianness on one packet and checking on another

Merge pull request #1375 in SNORT/snort3 from typos2 to master

Squashed commit of the following:

commit 532445c1381f26dc33508b09f3913407a1d12a04
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Sep 27 18:47:40 2018 -0400

    spell: fix typo

Merge pull request #1373 in SNORT/snort3 from flow_warning to master

Squashed commit of the following:

commit 06eebd9f653948a26740b895048611b7f40aaabf
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 27 11:14:51 2018 -0400

    TextLog: removed unused TextLog_Tell function

commit 77b9eb1f3784b69528c3b197c768cd81f5a18be5
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 27 10:03:05 2018 -0400

    stream: fixed build warning

commit 95315eae2d16bf8c4f195d30fe68352cc79cacec
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 27 10:01:09 2018 -0400

    Flow: fixed build warning

Merge pull request #1372 in SNORT/snort3 from nss_file_data_fix to master

Squashed commit of the following:

commit d0161f715422f7f32fdb40179c20018ad097940d
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Sep 26 14:10:23 2018 -0400

    mime: made the mime hdr info and current search thread local

Merge pull request #1371 in SNORT/snort3 from typos to master

Squashed commit of the following:

commit 46622b7e8f5d394060d66e543c4c814fb7d31661
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Sep 25 23:51:05 2018 -0400

    manual: fix some typos

commit 304524c7a7aa1214225258cb4f919779de3f8aa4
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Sep 25 23:42:07 2018 -0400

    source: fix some typos

Merge pull request #1362 in SNORT/snort3 from offload_flow_life to master

Squashed commit of the following:

commit 8b842c7d7c2560a325195925a4a365b9b68ada17
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Sep 17 16:56:15 2018 -0400

    Stream: only delete flows after all onloads

commit 3a5364780ca47ae5112d22ab8f6d84662e771748
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Sep 13 14:59:23 2018 -0400

    Flow: track multiple offloads

Merge pull request #1364 in SNORT/snort3 from offload_inspector_clear to master

Squashed commit of the following:

commit 6e21621729fe149abf19a943c6b52aeab1186c98
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Sep 18 16:06:02 2018 -0400

    DetectionEngine: Only clear inspector data after offloads have completed

Merge pull request #1370 in SNORT/snort3 from build_248 to master

Squashed commit of the following:

commit 0f28e8558a8873d3c2f44b3b4e3c3889d2d2b772
Author: Mike Stepanek <mstepane@cisco.com>
Date:   Wed Sep 26 09:56:39 2018 -0400

    Build 248

Merge pull request #1369 in SNORT/snort3 from custom_appid_stats to master

Squashed commit of the following:

commit 3f10481b57baf27a9ea17a643fa2154064600b8c
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Sep 24 13:39:00 2018 -0400

    appid: Adding detector builder and fixing stats to recognize custom appid; thanks to Wang Jun <traceflight@outlook.com> for reporting the issue

Merge pull request #1359 in SNORT/snort3 from pause_after_n to master

Squashed commit of the following:

commit 777a72243206730ae2880e5f1cf2386d5290d7a8
Author: mdagon <mdagon@cisco.com>
Date:   Tue Aug 14 10:54:37 2018 -0400

    snort: pause-after-n support

Merge pull request #1365 in SNORT/snort3 from file_type_fix to master

Squashed commit of the following:

commit 9c964722ee6e8eb1e56a86b4527a26abf9dbd10b
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Sep 18 17:29:10 2018 -0400

    file_api: fix off-by-one bug that was hurting performance

Merge pull request #1360 in SNORT/snort3 from ubuntu_check_fix to master

Squashed commit of the following:

commit 454dbec3a299148501df08b6fbe11fa20f04d1bb
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Sep 17 12:27:06 2018 -0400

    appid: Fixing ubuntu check tests

Merge pull request #1344 in SNORT/snort3 from offload_active to master

Squashed commit of the following:

commit 9f8c35fd54dcd56b3212f025b6b8bf31b5359654
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Aug 27 13:37:58 2018 -0400

    DetectionEngine: run active actions at onload

Merge pull request #1358 in SNORT/snort3 from freebsd_ut_fix to master

Squashed commit of the following:

commit c95929ad0ba29354f2b23883774c9502bfde1710
Author: Masud Hasan <mashasan@cisco.com>
Date:   Wed Sep 12 12:58:25 2018 -0400

    appid: FreeBSD unit-test fix

Merge pull request #1342 in SNORT/snort3 from stream_cleanup to master

Squashed commit of the following:

commit e2e541448233efbeb6e41530b8e4f99edad5af9a
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Aug 13 12:33:04 2018 -0400

    DetectionEngine: added post-onload callbacks

Merge pull request #1356 in SNORT/snort3 from offload_latency to master

Squashed commit of the following:

commit dd1db94f1e3c8a74f64c7f08912507b358646123
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Sep 7 12:37:37 2018 -0400

    Latency: added cleanup for RegexOffload threads

Merge pull request #1357 in SNORT/snort3 from firewall_appid_pub_sub to master

Squashed commit of the following:

commit 1216e90c23db8393f515bd5892c646a76e1be7c8
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Sep 4 11:12:54 2018 -0400

    appid: Supporting pub-sub mechanism for app changes

Merge pull request #1355 in SNORT/snort3 from any_zone_block_fix to master

Squashed commit of the following:

commit 649110d2b4c6747301ceccea9847d31271d67e1c
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Fri Sep 7 11:31:42 2018 -0400

    reputation: Fix - SI doesn't block traffic if Any Zone is specified

Merge pull request #1354 in SNORT/snort3 from dce_rpc_smb to master

Squashed commit of the following:

commit 3004490dcf1f493a05033a9eb7eafd65b60f92e3
Author: Mihaela <mivarga@cisco.com>
Date:   Fri Sep 7 08:36:03 2018 -0400

    dce_rpc: Add DCE2_SMB_NB_LT_COM (133:11) to the SMB rule map

Merge pull request #1349 in SNORT/snort3 from nhttp113 to master

Squashed commit of the following:

commit ff828f6ea9547c4377e8b1162c920839d4b78acb
Author: Tom Peters <thopeter@cisco.com>
Date:   Fri Jul 27 11:25:05 2018 -0400

    http_inspect: split and inspect immediately upon reaching depth

Merge pull request #1347 in SNORT/snort3 from port_scan_reload to master

Squashed commit of the following:

commit ef067a063a945799136392e55e97add27c295816
Author: mdagon <mdagon@cisco.com>
Date:   Thu Aug 23 12:45:44 2018 -0400

    inspector manager: if a plugin doesn't have tinit, still mark it as initialized

commit b9ca9be78cd5fab30f18cd6d78134813bbd9334d
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Apr 13 09:35:19 2018 -0400

    inspector_manager: Handle tinit for inspectors added during reload

Merge pull request #1353 in SNORT/snort3 from alpine to master

Squashed commit of the following:

commit 8bfe2663676b663fb4dad6788e8663e825f56f65
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Sep 4 21:25:45 2018 -0400

    build: Add libnsl and libsocket to Snort for Solaris builds

    Fixes Snort build on OpenIndiana.

commit 42dccb76a6c0d504118e2c71a68aa71070b09b9c
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Sep 4 18:30:54 2018 -0400

    build: Fall back on TI-RPC if no built-in RPC DB is found

    Necessary for getrpcent() on musl-based Linux systems.

commit c70cd8e45e2227c2937d350ad05d82c39f05350c
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Sep 4 19:07:14 2018 -0400

    daqs: Include unistd.h directly for better cross-platform compatibility

commit cb2df1c310054404c80339ff2b4de072ba1ed551
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Sep 4 15:32:45 2018 -0400

    build: Introduce a more robust check for GNU strerror_r

    This should better handle the case where we're using alternative C
    libraries on Linux like musl.

Merge pull request #1352 in SNORT/snort3 from sip_valgrind_fixes to master

Squashed commit of the following:

commit 3a57dd5dbfe0ee2850b0589746481bf807175da4
Author: Mike Stepanek <mstepane@cisco.com>
Date:   Tue Sep 4 14:38:35 2018 -0400

    appid: Fix valgrind issues in SIP event handler

Merge pull request #1351 in SNORT/snort3 from valgrind_reputation_init to master

Squashed commit of the following:

commit 0944be2fb6ec5eed346db9881102dd0396b460e4
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Aug 31 15:40:51 2018 -0400

    reputation: Early return on parsing error causing uninitialized id

Merge pull request #1345 in SNORT/snort3 from dcerpc_test_fix to master

Squashed commit of the following:

commit f26bc8c07f519106fb4a0e0b0619172dbb4840d2
Author: bokidi <bokidi@cisco.com>
Date:   Wed Aug 29 13:53:18 2018 -0400

    dce_rpc: Add DCE2_CO_REM_FRAG_LEN_LT_SIZE (133:31) to the TCP rule map

Merge pull request #1346 in SNORT/snort3 from ftp_preproc_test_add to master

Squashed commit of the following:

commit 46ab22195765465aea8564cfa111e62840c33bcb
Author: shaslad <shaslad@cisco.com>
Date:   Tue Aug 28 14:49:19 2018 -0400

    snort_defaults: changing default FTP EPSV string format

Merge pull request #1335 in SNORT/snort3 from disable_inspect to master

Squashed commit of the following:

commit f1c1cbc839d80a13ae36775533f2d1804aa6b587
Author: Silviu Minut <sminut@cisco.com>
Date:   Fri Aug 17 13:38:35 2018 -0400

    file_api:  set disable flow inspection as soon as the verdict is REJECT

    file_api: treat a BLOCK verdict the same as a REJECT verdict, for good measure.

    file_api: move the check on REJECT or BLOCK inside an upper if clause for performance reasons.

Merge pull request #1341 in SNORT/snort3 from offload_reload_fix to master

Squashed commit of the following:

commit b2628f9106194a07c325951cf2cf3e02a117f90b
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Aug 27 20:11:23 2018 -0400

    detection: allocate ips context data using hard coded max_ips_id == 32

Merge pull request #1343 in SNORT/snort3 from s_switcher_usage to master

Squashed commit of the following:

commit e1b965c371481d6d49f68166f4bb338ad7c80649
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Aug 23 16:25:18 2018 -0400

    DetectionEngine: don't use s_switcher to get file data

commit 1b5ef8073bf6615b14e6e17c40818e4d63c35df7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Aug 23 15:13:19 2018 -0400

    DetectionEngine: use packet to reference context

Squashed commit of the following:

commit 9a462e8960a5ea1f906339d8261eb280ba0cd24a
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Aug 27 18:09:42 2018 -0400

    build: 247 - beta

Merge pull request #1337 in SNORT/snort3 from stream_tcp_dup_no_more to master

Squashed commit of the following:

commit a10f22c3f011ddf297f9170fed3054a4b52b7023
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Jul 25 10:33:48 2018 -0400

    stream_tcp: update tsn state when partial buffer flushed, do not duplicate

    stream_tcp: delete tsn&data after flush, use seglist_base_seq to track progress

    use orig_dsize instead of payload_size for overlap math

    stream_tcp: eliminate 'buffered' field for tcp segment node struct

    stream_tcp: improve tcp segment state variable names and usage during reassembley and overlap processing

    stream_tcp: some refactoring to improve symbol names and code readability

Merge pull request #1334 in SNORT/snort3 from ips_appid_data_races to master

Squashed commit of the following:

commit 67961573d7d1f1965d381384003a1fafa900faf6
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Thu Aug 23 16:47:16 2018 -0400

    appid: Fix data-race issues from ips_appid_option and improve app_name search

Merge pull request #1339 in SNORT/snort3 from default_docs to master

Squashed commit of the following:

commit fa2e48976df06627fe62c6ff50de15749fcd3e10
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Aug 20 17:09:36 2018 -0400

    docs: update default html, pdf, and text user manuals

Merge pull request #1333 in SNORT/snort3 from reevaluate_flow_reputation to master

Squashed commit of the following:

commit 3ace3ed94c1046f1bb7c29730c6478a971567ce4
Author: Masud Hasan <mashasan@cisco.com>
Date:   Wed Aug 15 12:12:03 2018 -0400

    reputation: Reevaluate current flows upon reload

Merge pull request #1336 in SNORT/snort3 from onload to master

Squashed commit of the following:

commit 256a612f39b3ad7ccdb5294e215d2383b1072ffc
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Fri Aug 17 14:41:34 2018 -0400

    detection: avoid repeating detection by always doing non-fast-pattern rules immediately

build: Removing use of u_char and u_short macros (#53)

Merge pull request #1316 in SNORT/snort3 from appid_map_to_unordered_map to master

Squashed commit of the following:

commit 43fa9a3c3d63d8d3eaf642da1153d87afe494c02
Author: deramada <deramada@cisco.com>
Date:   Thu Jul 26 14:38:05 2018 -0400

    appid: change map to unordered map

    peg count changes

Merge pull request #1330 in SNORT/snort3 from smtp_early_detection to master

Squashed commit of the following:

commit bf17fcb491b8e017d4b37123e951b2d404159c9e
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Fri Aug 10 18:06:03 2018 -0400

    appid: Declare SMTPS early in STARTTLS state on success response code.

Merge pull request #1331 in SNORT/snort3 from build_246 to master

Squashed commit of the following:

commit 916ca28fdb132d667324f795b8f9487981830c18
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Aug 13 21:41:30 2018 -0400

    build: 246
    snort.lua: fix tweaks path; thanks to brastult@cisco.com for reporting the issue
    snort.lua: fix community rules filename; thanks to mike@flyn.org for reporting the issue

Merge pull request #1326 in SNORT/snort3 from offload_cleanup to master

Squashed commit of the following:

commit 249e1f755ebfc94df1f094c187f60687c19fc5b4
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Aug 6 13:18:05 2018 -0400

    DetectionEngine: don't finish_packet immediately after offloading

Merge pull request #1328 in SNORT/snort3 from offload_excess to master

Squashed commit of the following:

commit 17513d3a21748d734958a0af863ca8d0e652974b
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Aug 9 10:57:47 2018 -0400

    FlowCache: attempt pruning offloads in prune_excess

Merge pull request #1320 in SNORT/snort3 from ssn_state_onload to master

Squashed commit of the following:

commit c4eb773f347d8a11746d825121e0f3203bf0e8ff
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Aug 1 15:47:07 2018 -0400

    DetectionEngine: onload() before returning verdict to DAQ

commit 3452a911f471694b102ce0ce656b0528396782c7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Jul 19 17:44:37 2018 -0400

    IpsContext: snapshot flow state on pdu creation

Merge pull request #1319 in SNORT/snort3 from trace_buffers to master

Squashed commit of the following:

commit 5cecfb6a91d1ef15fe80738a820641d2e47a6df9
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Jul 30 16:57:55 2018 -0400

    Detection Trace: don't store current Packet* in THREAD_LOCAL

Merge pull request #1317 in SNORT/snort3 from packet_number to master

Squashed commit of the following:

commit cbc54035cb28bc2ed166b59c0cdd3ad817980320
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Jul 26 15:43:38 2018 -0400

    IpsContext: added packet number

Merge pull request #1321 in SNORT/snort3 from appid_data_races to master

Squashed commit of the following:

commit de23fde0a250955859238a3d614d60604b014b94
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Tue Aug 14 09:43:36 2018 -0400

    appid: fix multithreading issues (data races) from app_forecast

Merge pull request #1327 in SNORT/snort3 from ssh_test_version1 to master

Squashed commit of the following:

commit 61ee94ef5c6198f40a51f23fb81ea35cda9253c2
Author: bokidi <bokidi@cisco.com>
Date:   Tue Aug 7 15:29:24 2018 -0400

    ssh: added test code

Merge pull request #1318 in SNORT/snort3 from refactor_stats_pick to master

Squashed commit of the following:

commit 49b35ad68a0fa03d781ff72b0928d7bf346cd936
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Jul 27 15:40:18 2018 -0400

    appid: (commit 1) Refactoring log_stats, pick, and related code

    appid: (commit 2) Removing unknown_ui from pick_service_app_id

    appid: (commit 3) Naming appid arguments explicitly in api

    appid: (commit 4) Using option C and D for appid api

    appid: (commit 5) Return encrypted service id only if it contains valid information

    appid: (commit 6) return APP_ID_UNKNOWN_UI if no valid  APP_ID is found

Merge pull request #1329 in SNORT/snort3 from nhttp114 to master

Squashed commit of the following:

commit 0f2d05b6ead980a8056e5452774557ae037d76dc
Author: Tom Peters <thopeter@cisco.com>
Date:   Tue Aug 7 11:39:55 2018 -0400

    http_inspect: add perfmon to splitter

Merge pull request #1323 in SNORT/snort3 from reload_related to master

Squashed commit of the following:

commit 2509071633c041d8e2d98a0b6791bc0367256749
Author: mdagon <mdagon@cisco.com>
Date:   Mon Aug 6 14:03:24 2018 -0400

    reload: do not set policies for incremental reload case

commit 546c4e4f3a372fe41abcb09442fb58a86d3799be
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Jul 13 15:03:29 2018 -0400

    events: remove manager cruft

commit 2b1e77278b61adde72604baf65084e14301815b3
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Jul 13 15:02:21 2018 -0400

    reload: set policies upon swap to avoid dangling pointers when idle

commit aedf8debf5633fdd00e877426393392c181128cc
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Jul 13 15:00:38 2018 -0400

    parser: reset parse error count before reload to avoid confusion

Merge pull request #1322 in SNORT/snort3 from remove_chp_message to master

Squashed commit of the following:

commit 55f93357511d2acf5d6b01753b54695ef6ec8344
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Mon Aug 6 13:49:42 2018 -0400

    appid: Remove chp_* message from AppIdDbg

Merge pull request #1307 in SNORT/snort3 from sip_splitter_imp to master

Squashed commit of the following:

commit c9d4e9e2a643e7093d32708187a9fc6d84c16e3d
Author: Pratik Shinde <pshinde2@cisco.com>
Date:   Thu Jul 12 16:34:59 2018 -0400

    ServiceInspector: Ported sip-splitter implementation from snort2

    ServiceInspector: Fixed review comments

    ServiceInspector: Fixed review comments

Merge pull request #1314 in SNORT/snort3 from nhttp112 to master

Squashed commit of the following:

commit d20c92315a9ce84bb1ce58d3321d9412e5cd04c6
Author: Tom Peters <thopeter@cisco.com>
Date:   Wed Jul 18 15:27:51 2018 -0400

    http_inspect: memory reduction and misc cleanup

Merge pull request #1285 in SNORT/snort3 from merge_6_2_3_release_v2 to master

Squashed commit of the following:

commit d8a55035b9dd8e0c36337c673f712dfced25d0de
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Jun 20 23:23:06 2018 +0530

    Snort2lua: Handle sidechannel config.

Merge pull request #1294 in SNORT/snort3 from doc_tcmalloc_workaround to master

Squashed commit of the following:

commit 04332e192d4c39493cfc9efe165c996ed115130a
Author: Priyanka Gurudev <prbg@cisco.com>
Date:   Mon Jun 18 15:41:35 2018 -0400

    DOC: Update regarding the build issue with --enable-tcmalloc flag and known workarounds

Merge pull request #1313 in SNORT/snort3 from peg_count_data_race to master

Squashed commit of the following:

commit 5c2f0693abbb9b611239c11e555ca4425afd4b4f
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Jul 23 13:50:22 2018 -0400

    appid: Avoiding peg count data race

Merge pull request #1310 in SNORT/snort3 from appid_debug_fixes to master

Squashed commit of the following:

commit 32fdaf3fbf018546a775c01338960e96baf7d398
Author: Masud Hasan <mashasan@cisco.com>
Date:   Wed Jul 18 21:50:08 2018 -0400

    appid: Fixes for TNS, eDonkey, and debug logs in Lua detectors

Merge pull request #1311 in SNORT/snort3 from root_codecs to master

Squashed commit of the following:

commit e173d301bdc7f76cb408beb86532865e83de85ae
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Jul 20 10:31:48 2018 -0400

    codecs: fix dynamic build of root codecs

Merge pull request #1309 in SNORT/snort3 from reputation_reload to master

Squashed commit of the following:

commit 267ea293ce5e496ead3b4a1161177db6f8aa64f1
Author: huica <huica@cisco.com>
Date:   Fri Jul 13 10:30:35 2018 -0400

    reputation: support reload module

Merge pull request #1308 in SNORT/snort3 from raw_dlt to master

Squashed commit of the following:

commit 25919d4fcd1eda54066366047c58783dbfaf4743
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Jul 16 13:12:20 2018 -0400

    codecs: Handle raw IP packets in Snort proper

Merge pull request #1302 in SNORT/snort3 from dev_appid_to_appname to master

Squashed commit of the following:

commit 9807bf297f65cdc0349fdb0067ff4c29ac45b5fc
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Fri Jul 6 14:55:11 2018 -0400

    appid: print application name along with application ID in appid-debug messages

Merge pull request #1305 in SNORT/snort3 from length_based_detection to master

Squashed commit of the following:

commit 2d58ed897ecba77b3721c802ed7b259d34b798a1
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Jul 10 11:50:01 2018 -0400

    appid: Refactoring length based detection

Merge pull request #1301 in SNORT/snort3 from fix_file_magic to master

Squashed commit of the following:

commit 940ca0bf6de0f0647fcfbb9e834ffa1fb3399a44
Author: Alex Nagia (alnagia) <alnagia@cisco.com>
Date:   Thu Jul 5 19:16:58 2018 +0000

    file_magic: Update file_magic.lua to cover all file types and versions

Merge pull request #1304 in SNORT/snort3 from appid_third_party_useragent to master

Squashed commit of the following:

commit c095f6bde929fa1fe20e16d126e118e6520b2773
Author: deramada <deramada@cisco.com>
Date:   Tue Jul 10 09:47:19 2018 -0400

    appid: use useragent returned from thirdparty

Merge pull request #1303 in SNORT/snort3 from xhash_alternatives to master

Squashed commit of the following:

commit 2a80681d630c8ef65435733247f7539e42441b59
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Jul 6 15:26:11 2018 -0400

    appid: Replacing xhash with alternative data structures

Merge pull request #1286 in SNORT/snort3 from offload_crash to master

Squashed commit of the following:

commit 53d14ee1015a9df4b133589bece240fb39d84179
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Jul 2 17:07:55 2018 -0400

    detection: don't offload when 0 threads are configured

Merge pull request #1300 in SNORT/snort3 from appid_double_free_fix to master

Squashed commit of the following:

commit 9063b30050a77473124edbf3d3d38fdd9dacac14
Author: deramada <deramada@cisco.com>
Date:   Fri Jul 6 11:25:10 2018 -0400

    appid: prevent process threads from adding entries to udp_reversed_services

Merge pull request #1299 in SNORT/snort3 from stream_tcp_fin_handling to master

Squashed commit of the following:

commit 506ca045fd6219e2e8fcdc50735e9d8a0e36a20e
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Jun 27 10:45:15 2018 -0400

    stream_tcp: 86 r_nxt_ack as tracker state for next rx seq, use rcv_nxt instead

commit 45aa8684c57804309b298dcb4fe797274a09e987
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Thu Jun 21 14:18:04 2018 -0400

    stream_tcp: back out fin handling changes for bug not relevant to snort3

Merge pull request #1283 in SNORT/snort3 from dev_appid_perf to master

Squashed commit of the following:

commit c8a7fa9cfb07d3ca24bc5916a3ef008d2b577f4b
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Thu Jun 21 15:14:23 2018 -0400

    appid: remove lock guard while accessing app_info_table

Merge pull request #1288 in SNORT/snort3 from offload_dce_ropts to master

Squashed commit of the following:

commit 83ca1ea08c2265f65995d547884c1e0501471357
Author: BT <bbantwal@cisco.com>
Date:   Tue Jun 26 00:36:28 2018 -0400

    detection: save the ropts used for dce rule options in ips context to support offload

Merge pull request #1298 in SNORT/snort3 from reload_perfmon to master

Squashed commit of the following:

commit 19d5460377fa2275f61ae2b9fd1b0cf18c740ada
Author: mdagon <mdagon@cisco.com>
Date:   Thu Jun 28 09:29:14 2018 -0400

    perf_monitor: fix for reload

Merge pull request #1292 in SNORT/snort3 from appid_conf_flags to master

Squashed commit of the following:

commit 520a3f692baae1dbf979c6cdefa6455accd9a05e
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Jun 26 12:02:33 2018 -0400

    appid: combine the two calls to get_app_info_flags() into a single one.

Merge pull request #1296 in SNORT/snort3 from snort_min_interval to master

Squashed commit of the following:

commit 17cfa2bd3676c8008d7de11307812ed43f404f22
Author: Cristian <candrone@cisco.com>
Date:   Thu Jun 28 04:46:26 2018 -0400

    active: Add an upper limit of 255 to min_interval

Merge pull request #1295 in SNORT/snort3 from fix_warnings_appid to master

Squashed commit of the following:

commit 568dd4317b0dac192f3a9d1f2e1c032bde05a820
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Fri Jun 29 12:37:33 2018 -0400

    appid: fix review comments

commit b076a8d29d06a3db2e0c61ded0e85526bc1226d5
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Fri Jun 29 11:51:01 2018 -0400

    appid: fix review comments

commit b07837f571939787aa2b9cb815879c13b3d0f0c8
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Fri Jun 29 11:44:53 2018 -0400

    appid: fix review comments

commit d5920c2a3b2e46871e4d9a444a5e659767667077
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Thu Jun 28 15:21:04 2018 -0400

    appid: fix review comments

commit 20159ed03ccee5dc1760a19600b14f1e32713f99
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Thu Jun 28 15:16:40 2018 -0400

    appid: fix warnings

commit 7123e9b984ce710124df7417f8e9f322ea014d6f
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Wed Jun 27 14:58:09 2018 -0400

    appid: fix warnings related to change sign and variable hiding