Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 05:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adapt HTTP partial content to cache file analysis IDs.

Browse source 
The initial file ID I think is still ambiguous and/or depends on
script-layer state tracking enough that it still needs to request a file
ID via an event at first, but once that is assigned to an HTTP (MIME)
entity, it never makes sense that it can change (so re-using a cached ID
works).
This commit is contained in:
Jon Siwek 2014-04-24 10:47:57 -05:00
parent 58efa09426
commit d3b27eb0c1
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/analyzer/protocol/http/HTTP.cc
View file

@ -243,10 +243,10 @@ int HTTP_Entity::Undelivered(int64_t len)
return 0; return 0;
if ( is_partial_content ) if ( is_partial_content )
file_mgr->Gap(body_length, len, precomputed_file_id = file_mgr->Gap(body_length, len,
http_message->MyHTTP_Analyzer()->GetAnalyzerTag(), http_message->MyHTTP_Analyzer()->GetAnalyzerTag(),
http_message->MyHTTP_Analyzer()->Conn(), http_message->MyHTTP_Analyzer()->Conn(),
http_message->IsOrig()); http_message->IsOrig(), precomputed_file_id);
else else
precomputed_file_id = file_mgr->Gap(body_length, len, precomputed_file_id = file_mgr->Gap(body_length, len,
http_message->MyHTTP_Analyzer()->GetAnalyzerTag(), http_message->MyHTTP_Analyzer()->GetAnalyzerTag(),
@ -306,15 +306,15 @@ void HTTP_Entity::SubmitData(int len, const char* buf)
if ( is_partial_content ) if ( is_partial_content )
{ {
if ( send_size && instance_length > 0 ) if ( send_size && instance_length > 0 )
file_mgr->SetSize(instance_length, precomputed_file_id = file_mgr->SetSize(instance_length,
http_message->MyHTTP_Analyzer()->GetAnalyzerTag(), http_message->MyHTTP_Analyzer()->GetAnalyzerTag(),
http_message->MyHTTP_Analyzer()->Conn(), http_message->MyHTTP_Analyzer()->Conn(),
http_message->IsOrig()); http_message->IsOrig(), precomputed_file_id);
file_mgr->DataIn(reinterpret_cast<const u_char*>(buf), len, offset, precomputed_file_id = file_mgr->DataIn(reinterpret_cast<const u_char*>(buf), len, offset,
http_message->MyHTTP_Analyzer()->GetAnalyzerTag(), http_message->MyHTTP_Analyzer()->GetAnalyzerTag(),
http_message->MyHTTP_Analyzer()->Conn(), http_message->MyHTTP_Analyzer()->Conn(),
http_message->IsOrig()); http_message->IsOrig(), precomputed_file_id);
offset += len; offset += len;
} }