From: Russ Combs <rucombs@cisco.com>
Date: Thu, 23 Oct 2014 18:41:22 +0000 (-0400)
Subject: fixed partial flushes
X-Git-Tag: 3.0.0-233~1336
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8959d42b4e672c737055dfdff5aee8e9c224c797;p=thirdparty%2Fsnort3.git

fixed partial flushes
---

diff --git a/ChangeLog b/ChangeLog
index 78e075b79..9c4b5538c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@
 -- changed stream to not generate rebuilt packets when the splitter doesn't
    reassemble packets (ie nhttp internal buffers)
 -- added rebuilt buffers count
+-- fixed partial flushes
 
 125
 -- discovered can't catch exceptions thrown from Lua to C++; need to
diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 30e42240f..79a748598 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -2112,8 +2112,10 @@ static inline int _flush_to_seq (
             break; /* No more data... bail */
 
         else if ( !s5_pkt->dsize )
+        {
             tcpStats.rebuilt_buffers++;
-
+            bytes_processed += flushed_bytes;
+        }
         else
         {
             s5_pkt->packet_flags |= (PKT_REBUILT_STREAM|PKT_STREAM_EST);