From: rcombs <rcombs@sq18.sfeng.sourcefire.com>
Date: Tue, 21 Oct 2014 22:16:09 +0000 (-0400)
Subject: delete bogus code from hi paf
X-Git-Tag: 3.0.0-233~1350^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b3d90cc6a594f0b8cd216ffd60da9cf91fb227;p=thirdparty%2Fsnort3.git

delete bogus code from hi paf
---

diff --git a/ChangeLog b/ChangeLog
index 28f6d8015..e7e60336f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 -- flow state updates
 -- plug tcp session leak
 -- fix paf abort to resume with atom splitter
+-- delete bogus code introduced into hi paf
 
 125
 -- discovered can't catch exceptions thrown from Lua to C++; need to
diff --git a/src/service_inspectors/http_inspect/hi_paf.cc b/src/service_inspectors/http_inspect/hi_paf.cc
index f3d8658d7..30910420c 100644
--- a/src/service_inspectors/http_inspect/hi_paf.cc
+++ b/src/service_inspectors/http_inspect/hi_paf.cc
@@ -701,8 +701,6 @@ static inline StreamSplitter::Status hi_exec (Hi5State* s, Action a, int c)
                 "%s: lnc=%u\n", __FUNCTION__, s->len);)
             if ( s->len )
                 return StreamSplitter::SKIP;
-            else
-                return StreamSplitter::FLUSH;
             s->flags &= ~HIF_NOF;
             s->msg = 3;
             break;
diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 75cedd368..0ab0476f5 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -2208,6 +2208,7 @@ static inline int flush_to_seq(
 
         st->flags |= TF_MISSING_PREV_PKT;
         st->flags |= TF_PKT_MISSED;
+
         tcpStats.gaps++;
         st->seglist_base_seq = st->seglist_next->seq;