Move IntrusivePtr and utility methods to the zeek namespace

This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:40:00 -04:00
parent 4668378d91
commit 9364e6a5b7
255 changed files with 3761 additions and 3730 deletions

View file

@ -145,7 +145,7 @@ protected:
HTTP_Entity* current_entity;
IntrusivePtr<RecordVal> BuildMessageStat(bool interrupted, const char* msg);
zeek::IntrusivePtr<RecordVal> BuildMessageStat(bool interrupted, const char* msg);
};
class HTTP_Analyzer final : public tcp::TCP_ApplicationAnalyzer {
@ -156,7 +156,7 @@ public:
void HTTP_EntityData(bool is_orig, BroString* entity_data);
void HTTP_MessageDone(bool is_orig, HTTP_Message* message);
void HTTP_Event(const char* category, const char* detail);
void HTTP_Event(const char* category, IntrusivePtr<StringVal> detail);
void HTTP_Event(const char* category, zeek::IntrusivePtr<StringVal> detail);
void SkipEntityData(bool is_orig);
@ -237,7 +237,7 @@ protected:
int HTTP_ReplyCode(const char* code_str);
int ExpectReplyMessageBody();
IntrusivePtr<StringVal> TruncateURI(const IntrusivePtr<StringVal>& uri);
zeek::IntrusivePtr<StringVal> TruncateURI(const zeek::IntrusivePtr<StringVal>& uri);
int request_state, reply_state;
int num_requests, num_replies;
@ -257,19 +257,19 @@ protected:
// in a reply.
std::string upgrade_protocol;
IntrusivePtr<StringVal> request_method;
zeek::IntrusivePtr<StringVal> request_method;
// request_URI is in the original form (may contain '%<hex><hex>'
// sequences).
IntrusivePtr<StringVal> request_URI;
zeek::IntrusivePtr<StringVal> request_URI;
// unescaped_URI does not contain escaped sequences.
IntrusivePtr<StringVal> unescaped_URI;
zeek::IntrusivePtr<StringVal> unescaped_URI;
std::queue<IntrusivePtr<StringVal>> unanswered_requests;
std::queue<zeek::IntrusivePtr<StringVal>> unanswered_requests;
int reply_code;
IntrusivePtr<StringVal> reply_reason_phrase;
zeek::IntrusivePtr<StringVal> reply_reason_phrase;
tcp::ContentLine_Analyzer* content_line_orig;
tcp::ContentLine_Analyzer* content_line_resp;