From: Russ Combs <rucombs@cisco.com>
Date: Thu, 29 May 2014 20:17:36 +0000 (-0400)
Subject: fixed autodisable atom splitter
X-Git-Tag: 3.0.0-233~1512
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeb442ff6c266d427df67681212dde0676dc5bde;p=thirdparty%2Fsnort3.git

fixed autodisable atom splitter
---

diff --git a/ChangeLog b/ChangeLog
index e3a1eedcb..04ac786cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+82
+-- fixed atom splitter instantiation for fallback in tcp_session.cc
+
 81
 -- deleted service registration for paf
 -- added StreamSplitter to Inspector
diff --git a/configure.ac b/configure.ac
index 8bfa281ca..a4b1cb59c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@
 # initialization
 #--------------------------------------------------------------------------
 
-AC_INIT([snort], [2.10.081])
+AC_INIT([snort], [2.10.082])
 AC_PREREQ([2.68])
 
 AC_CONFIG_SRCDIR([src/main.h])
diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 14caab003..303794f7e 100644
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -6217,7 +6217,7 @@ static inline int CheckFlushPolicyOnData(
                 //    return 0;
 
                 delete listener->splitter;
-                listener->splitter = new AtomSplitter(listener->config->paf_max);
+                listener->splitter = new AtomSplitter(true, listener->config->paf_max);
 
                 return CheckFlushPolicyOnData(tcpssn, talker, listener, tdb, p);
             }
@@ -6349,7 +6349,7 @@ int CheckFlushPolicyOnAck(
                 //    return 0;
 
                 delete talker->splitter;
-                talker->splitter = new AtomSplitter(listener->config->paf_max);
+                talker->splitter = new AtomSplitter(false, talker->config->paf_max);
 
                 return CheckFlushPolicyOnAck(tcpssn, talker, listener, tdb, p);
             }