From: rcombs Date: Wed, 22 Oct 2014 13:03:43 +0000 (-0400) Subject: reorg abort actions for ifdef X-Git-Tag: 3.0.0-233~1349 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9de0eb62f628fd8a513a9c96e415d137262c4709;p=thirdparty%2Fsnort3.git reorg abort actions for ifdef --- diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc index 0ab0476f5..40e005272 100644 --- a/src/stream/tcp/tcp_session.cc +++ b/src/stream/tcp/tcp_session.cc @@ -6084,17 +6084,17 @@ int CheckFlushPolicyOnAck( //if ( AutoDisable(talker, listener) ) // return 0; - delete talker->splitter; - delete listener->splitter; - bool c2s = (p->packet_flags & PKT_FROM_CLIENT) != 0; + delete talker->splitter; talker->splitter = new AtomSplitter(c2s, talker->config->paf_max); - listener->splitter = new AtomSplitter(!c2s, listener->config->paf_max); - - s5_paf_setup(&talker->paf_state); - s5_paf_setup(&listener->paf_state); + talker->paf_state.paf = StreamSplitter::SEARCH; +#if 1 // FIXIT-M abort both sides ? + delete listener->splitter; + listener->splitter = new AtomSplitter(!c2s, listener->config->paf_max); + listener->paf_state.paf = StreamSplitter::SEARCH; +#endif return CheckFlushPolicyOnAck(tcpssn, talker, listener, p); } }