stream: debug improvements

pull/2673/head
Victor Julien 9 years ago
parent aba9cd7d02
commit 34f7cb2b55

@ -750,8 +750,8 @@ void StreamTcpPruneSession(Flow *f, uint8_t flags)
if (stream->flags & STREAMTCP_STREAM_FLAG_DEPTH_REACHED) {
stream->flags |= STREAMTCP_STREAM_FLAG_NOREASSEMBLY;
SCLogDebug("ssn %p: reassembly depth reached, "
"STREAMTCP_STREAM_FLAG_NOREASSEMBLY set", ssn);
SCLogDebug("ssn %p / stream %p: reassembly depth reached, "
"STREAMTCP_STREAM_FLAG_NOREASSEMBLY set", ssn, stream);
StreamTcpReturnStreamSegments(stream);
StreamingBufferClear(&stream->sb);
return;
@ -760,8 +760,8 @@ void StreamTcpPruneSession(Flow *f, uint8_t flags)
(stream->flags & STREAMTCP_STREAM_FLAG_GAP)) &&
(stream->flags & STREAMTCP_STREAM_FLAG_DISABLE_RAW))
{
SCLogDebug("ssn %p: both app and raw are done, "
"STREAMTCP_STREAM_FLAG_NOREASSEMBLY set", ssn);
SCLogDebug("ssn %p / stream %p: both app and raw are done, "
"STREAMTCP_STREAM_FLAG_NOREASSEMBLY set", ssn, stream);
stream->flags |= STREAMTCP_STREAM_FLAG_NOREASSEMBLY;
StreamTcpReturnStreamSegments(stream);
StreamingBufferClear(&stream->sb);

@ -1706,7 +1706,13 @@ int StreamTcpReassembleHandleSegment(ThreadVars *tv, TcpReassemblyThreadCtx *ra_
SCReturnInt(-1);
}
SCLogDebug("packet %"PRIu64" set PKT_STREAM_ADD", p->pcap_cnt);
p->flags |= PKT_STREAM_ADD;
} else {
SCLogDebug("ssn %p / stream %p: not calling StreamTcpReassembleHandleSegmentHandleData:"
" p->payload_len %u, STREAMTCP_STREAM_FLAG_NOREASSEMBLY %s",
ssn, stream, p->payload_len,
(stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY) ? "true" : "false");
}
/* in stream inline mode even if we have no data we call the reassembly

Loading…
Cancel
Save