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

Changing the HTTP's analyzers internals to use 64-bit integers.

Browse source 
(Gregor Maier).

This is the patch from #326, plus some cleanup.
This commit is contained in:
Robin Sommer 2011-04-27 21:25:51 -07:00
parent 80376653c2
commit 714289bd13
13 changed files with 56 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/HTTP.cc
View file

@ -226,7 +226,7 @@ void HTTP_Entity::DeliverBodyClear(int len, const char* data, int trailing_CRLF)
// Returns 1 if the undelivered bytes are completely within the body,
// otherwise returns 0.
int HTTP_Entity::Undelivered(int len)
int HTTP_Entity::Undelivered(int64_t len)
{
if ( DEBUG_http )
{
@ -283,7 +283,7 @@ void HTTP_Entity::SubmitData(int len, const char* buf)
MIME_Entity::SubmitData(len, buf);
}
void HTTP_Entity::SetPlainDelivery(int length)
void HTTP_Entity::SetPlainDelivery(int64_t length)
{
ASSERT(length >= 0);
ASSERT(length == 0 || ! in_header);
@ -302,7 +302,7 @@ void HTTP_Entity::SubmitHeader(MIME_Header* h)
data_chunk_t vt = h->get_value_token();
if ( ! is_null_data_chunk(vt) )
{
int n;
int64_t n;
if ( atoi_n(vt.length, vt.data, 0, 10, n) )
content_length = n;
else
@ -409,7 +409,7 @@ void HTTP_Entity::SubmitAllHeaders()
HTTP_Message::HTTP_Message(HTTP_Analyzer* arg_analyzer,
ContentLine_Analyzer* arg_cl, bool arg_is_orig,
int expect_body, int init_header_length)
int expect_body, int64_t init_header_length)
: MIME_Message (arg_analyzer)
{
analyzer = arg_analyzer;
@ -477,7 +477,7 @@ void HTTP_Message::Done(const int interrupted, const char* detail)
}
}
int HTTP_Message::Undelivered(int len)
int HTTP_Message::Undelivered(int64_t len)
{
if ( ! top_level )
return 0;
@ -628,7 +628,7 @@ void HTTP_Message::SubmitEvent(int event_type, const char* detail)
MyHTTP_Analyzer()->HTTP_Event(category, detail);
}
void HTTP_Message::SetPlainDelivery(int length)
void HTTP_Message::SetPlainDelivery(int64_t length)
{
content_line->SetPlainDelivery(length);
@ -701,7 +701,7 @@ void HTTP_Message::DeliverEntityData()
total_buffer_size = 0;
}
int HTTP_Message::InitBuffer(int length)
int HTTP_Message::InitBuffer(int64_t length)
{
if ( length <= 0 )
return 0;
@ -1633,7 +1633,7 @@ void HTTP_Analyzer::HTTP_MessageDone(int is_orig, HTTP_Message* /* message */)
}
void HTTP_Analyzer::InitHTTPMessage(ContentLine_Analyzer* cl, HTTP_Message*& message,
bool is_orig, int expect_body, int init_header_length)
bool is_orig, int expect_body, int64_t init_header_length)
{
if ( message )
{