From f68fd5064ed846f843db6fe83fc862404bf0a868 Mon Sep 17 00:00:00 2001
From: Russ Combs <rucombs@cisco.com>
Date: Sat, 24 Sep 2016 16:43:15 -0400
Subject: [PATCH] build 212

---
 ChangeLog                         | 21 +++++++++++++++++++++
 src/main/build.h                  |  2 +-
 src/stream/tcp/tcp_reassembler.cc |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 601cf8e5a..572765f7b 100644
--- 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 0bf8cfdcf..2e5811e03 100644
--- 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 256e32097..a87a101f4 100644
--- 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;
-- 
2.47.3