Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ContentLine: Add GetDeliverStreamRemainingLength() accessor

Browse source 
Helper to get information from the ContentLine analyzer about
bytes still pending to be delivered. In certain cases this can
be a signal for weirdness.
This commit is contained in:
Arne Welzel 2024-01-18 18:42:42 +01:00
parent 7967ef993b
commit 2b9776adca
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/analyzer/protocol/tcp/ContentLine.cc
View file

@ -30,6 +30,7 @@ void ContentLine_Analyzer::InitState() {
delivery_length = -1; delivery_length = -1;
is_plain = false; is_plain = false;
suppress_weirds = false; suppress_weirds = false;
deliver_stream_remaining_length = 0;
InitBuffer(0); InitBuffer(0);
} }
@ -149,6 +150,7 @@ void ContentLine_Analyzer::DoDeliver(int len, const u_char* data) {
plain_delivery_length -= deliver_plain; plain_delivery_length -= deliver_plain;
is_plain = true; is_plain = true;
deliver_stream_remaining_length = len - deliver_plain;
ForwardStream(deliver_plain, data, IsOrig()); ForwardStream(deliver_plain, data, IsOrig());
is_plain = false; is_plain = false;
@ -207,6 +209,7 @@ int ContentLine_Analyzer::DoDeliverOnce(int len, const u_char* data) {
int seq_len = data + 1 - data_start; \ int seq_len = data + 1 - data_start; \
seq_delivered_in_lines = seq + seq_len; \ seq_delivered_in_lines = seq + seq_len; \
last_char = c; \ last_char = c; \
deliver_stream_remaining_length = len - 1; \
ForwardStream(offset, buf, IsOrig()); \ ForwardStream(offset, buf, IsOrig()); \
offset = 0; \ offset = 0; \
return seq_len; \ return seq_len; \

7
src/analyzer/protocol/tcp/ContentLine.h
View file

@ -47,6 +47,11 @@ public:
int64_t GetPlainDeliveryLength() const { return plain_delivery_length; } int64_t GetPlainDeliveryLength() const { return plain_delivery_length; }
bool IsPlainDelivery() { return is_plain; } bool IsPlainDelivery() { return is_plain; }
// Helper to check how many bytes are still in-flight for the
// current DeliverStream() invocation. This can be called
// by the parent during its DeliverStream() invocation.
int GetDeliverStreamRemainingLength() const { return deliver_stream_remaining_length; }
// Skip <length> bytes after this line. // Skip <length> bytes after this line.
// Can be used to skip HTTP data for performance considerations. // Can be used to skip HTTP data for performance considerations.
void SkipBytesAfterThisLine(int64_t length); void SkipBytesAfterThisLine(int64_t length);
@ -107,6 +112,8 @@ protected:
// Whether to skip partial conns. // Whether to skip partial conns.
bool skip_partial; bool skip_partial;
int deliver_stream_remaining_length;
}; };
} // namespace zeek::analyzer::tcp } // namespace zeek::analyzer::tcp