small changes

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_flow_data.h b/src/service_inspectors/nhttp_inspect/nhttp_flow_data.h
index 00c2fe8c51e2167e348582d6afaa1a04a7a28d33..8c53e054fca5b852c143f720f2da7bd591976996 100644 (file)
--- a/src/service_inspectors/nhttp_inspect/nhttp_flow_data.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_flow_data.h
@@ -52,8 +52,10 @@ public:
 private:
     void half_reset(NHttpEnums::SourceId source_id);
 
-    // StreamSplitter internal data
+    // StreamSplitter internal data - scan()
     NHttpSplitter* splitter[2] = { nullptr, nullptr };
+
+    // StreamSplitter internal data - reassemble()
     uint8_t* section_buffer[2] = { nullptr, nullptr };
     int32_t section_buffer_length[2] = { 0, 0 };
     bool section_buffer_owned[2] = { true, true };

diff --git a/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc b/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc
index e42185ff0fbddf7e2736602d0f00323f25586245..a25b6e7bfca7af0c3f00835d07c414219ebcf6ba 100644 (file)
--- a/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc
@@ -257,7 +257,7 @@ const StreamBuffer* NHttpStreamSplitter::reassemble(Flow* flow, unsigned total,
         // a session. In any event it doesn't belong here because we cannot process it. Forward it to our parent class
         // for processing. There should be no more calls to scan() for this session but tell it to abort just in case.
 
-        // session_data->type_expected[source_id] = SEC_ABORT; /* FIXIT-M this statement breaks the test tool */
+        session_data->type_expected[source_id] = SEC_ABORT;
         return StreamSplitter::reassemble(flow, total, offset, data, len, flags, copied);
     }