build 212

diff --git a/ChangeLog b/ChangeLog
index 601cf8e5a98ba0a2ca1014559e89b3d1ff9e2ecc..572765f7be3649096687d31c6512fdc345e60e0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+16/09/24 - build 212
+
+-- add dce udp snort2lua
+-- add file detection when they are transferred in segments in SMB2
+-- fix another case of CPPUTest header order issues
+-- separate idle timeouts from session timeouts counts
+-- close tcp on rst in close wait, closing, fin wait 1, and fin wait 2
+-- doc: update style guide for 'using' statements and underscores
+-- packet_capture: Include top-level pcap.h for backward compatibility
+-- main: remove unused -w commandline option
+-- lua: fix conflict with _L macro from ctype.h on OpenBSD
+-- cmake: clean dead variables out of config.cmake.h
+-- build: fix 32-bit compiler warnings
+-- build: fix illumos/OpenSolaris build and remove SOLARIS/SUNOS defines
+-- build: remove superfluous LINUX and MACOS definitions
+-- build: remove superfluous OPENBSD and FREEBSD definitions
+-- build: entering 'std' namespace should be after all headers are included
+-- build: clean up u_int*_t usage
+-- build: remove SPARC support
+-- build: clean up some DAQ header inclusion creep.
+
 16/09/22 - build 211
 
 -- fix hyperscan detection with nocase

diff --git a/src/main/build.h b/src/main/build.h
index 0bf8cfdcf2de694e704b20670a0ecc2a5d2f23f2..2e5811e03711b247ea9d4b52d9dc5835152a916a 100644 (file)
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "211"
+#define BUILD "212"
 
 #endif
 

diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index 256e32097edfa0e35d880aadd0dda0fc9bec057c..a87a101f4e0af7688a98330863c306292dda436e 100644 (file)
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -555,7 +555,7 @@ int TcpReassembler::flush_data_segments(Packet* p, uint32_t toSeq)
 
     DEBUG_WRAP(bytes_queued -= bytes_flushed; );
     DebugFormat(DEBUG_STREAM_STATE,
-        "flushed %hu bytes / %u segs on stream, %u bytes still queued\n",
+        "flushed %u bytes / %u segs on stream, %u bytes still queued\n",
         bytes_flushed, segs, bytes_queued);
 
     return bytes_flushed;