From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Wed, 26 Sep 2018 15:04:53 +0000 (-0400)
Subject: Merge pull request #1370 in SNORT/snort3 from build_248 to master
X-Git-Tag: 3.0.0-248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b363c3255011bff0c08ec26e09e2db2351fc3ec;p=thirdparty%2Fsnort3.git

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

diff --git a/ChangeLog b/ChangeLog
index e4989abdf..190171821 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+18/09/26 - build 248
+
+-- appid: adding detector builder and fixing stats to recognize custom appid
+   thanks to Wang Jun <traceflight@outlook.com> for reporting the issue
+-- appid: fixing ubuntu check tests
+-- appid: fix valgrind issues in SIP event handler
+-- appid: FreeBSD unit-test fix
+-- appid: supporting pub-sub mechanism for app changes
+-- build: add libnsl and libsocket to Snort for Solaris builds
+-- build: fall back on TI-RPC if no built-in RPC DB is found
+-- build: introduce a more robust check for GNU strerror_r
+-- daqs: include unistd.h directly for better cross-platform compatibility
+-- dce_rpc: add DCE2_CO_REM_FRAG_LEN_LT_SIZE (133:31) to the TCP rule map
+-- dce_rpc: add DCE2_SMB_NB_LT_COM (133:11) to the SMB rule map
+-- detection: added post-onload callbacks
+-- detection: allocate ips context data using hard coded max_ips_id == 32
+-- detection: don't use s_switcher to get file data
+-- detection: run active actions at onload
+-- detection: use packet to reference context
+-- file_api: fix off-by-one bug that was hurting performance
+-- file_api: move the check on REJECT or BLOCK inside an upper if clause for performance reasons
+-- 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
+-- http_inspect: split and inspect immediately upon reaching depth
+-- latency: added cleanup for RegexOffload threads
+-- lua: changing default FTP EPSV string format
+-- main: pause-after-n support
+-- managers: handle tinit for inspectors added during reload
+-- managers: if a plugin doesn't have tinit, still mark it as initialized
+-- reputation: early return on parsing error causing uninitialized id
+-- reputation: fix SI doesn't block traffic if Any Zone is specified
+
 18/08/27 - build 247 - Beta
 
 -- appid: change map to unordered map
diff --git a/src/main/build.h b/src/main/build.h
index 001ff482d..de76a9961 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -12,7 +12,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD_NUMBER 247
+#define BUILD_NUMBER 248
 
 #ifndef EXTRABUILD
 #define BUILD STRINGIFY_MX(BUILD_NUMBER)