From: Russ Combs <rucombs@cisco.com>
Date: Fri, 24 Oct 2014 19:00:08 +0000 (-0400)
Subject: remove force on session clear
X-Git-Tag: 3.0.0-233~1329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b2e6a6a75482640afbeb2efe90a82557976bcae;p=thirdparty%2Fsnort3.git

remove force on session clear
---

diff --git a/ChangeLog b/ChangeLog
index 90aca10a2..88fb81eac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
 -- patched session clear flushed to be forced
 -- fixed up --dump-defaults so that it can be validated unedited
 -- fixed normalizer init of flow
+-- pulled latest from Tom
+-- removed force from session clear
 
 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 2491ef831..dc29366cf 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -5737,10 +5737,7 @@ dupfin:
                         "flushing FROM_SERVER\n"););
             if(talker->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                talker->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, talker, p, PKT_FROM_CLIENT);
-                talker->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {
@@ -5752,10 +5749,7 @@ dupfin:
 
             if(listener->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                listener->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, listener, p, PKT_FROM_SERVER);
-                listener->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {
@@ -5770,10 +5764,7 @@ dupfin:
                         "flushing FROM_CLIENT\n"););
             if(listener->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                listener->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, listener, p, PKT_FROM_CLIENT);
-                listener->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {
@@ -5784,10 +5775,7 @@ dupfin:
 
             if(talker->seg_bytes_logical)
             {
-                // FIXIT-H temporary force to work around nhttp
-                talker->flags |= TF_FORCE_FLUSH;
                 uint32_t flushed = flush_stream(tcpssn, talker, p, PKT_FROM_SERVER);
-                talker->flags &= ~TF_FORCE_FLUSH;
 
                 if(flushed)
                 {