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

@ -5,7 +5,7 @@ enum Trans_subcommands {
};
%code{
IntrusivePtr<StringVal> SMB_Conn::transaction_data_to_val(SMB1_transaction_data* payload)
zeek::IntrusivePtr<StringVal> SMB_Conn::transaction_data_to_val(SMB1_transaction_data* payload)
{
switch ( payload->trans_type() ) {
case SMB_PIPE:
@ -26,7 +26,7 @@ refine connection SMB_Conn += {
%member{
map<uint16, bool> is_file_a_pipe;
static IntrusivePtr<StringVal> transaction_data_to_val(SMB1_transaction_data* payload);
static zeek::IntrusivePtr<StringVal> transaction_data_to_val(SMB1_transaction_data* payload);
%}
function get_is_file_a_pipe(id: uint16): bool
@ -53,9 +53,9 @@ refine connection SMB_Conn += {
if ( ! smb1_transaction_request )
return false;
auto parameters = make_intrusive<StringVal>(${val.parameters}.length(),
(const char*)${val.parameters}.data());
IntrusivePtr<StringVal> payload_str;
auto parameters = zeek::make_intrusive<StringVal>(${val.parameters}.length(),
(const char*)${val.parameters}.data());
zeek::IntrusivePtr<StringVal> payload_str;
if ( ${val.data_count} > 0 )
payload_str = transaction_data_to_val(${val.data});
@ -78,9 +78,9 @@ refine connection SMB_Conn += {
if ( ! smb1_transaction_response )
return false;
auto parameters = make_intrusive<StringVal>(${val.parameters}.length(),
(const char*)${val.parameters}.data());
IntrusivePtr<StringVal> payload_str;
auto parameters = zeek::make_intrusive<StringVal>(${val.parameters}.length(),
(const char*)${val.parameters}.data());
zeek::IntrusivePtr<StringVal> payload_str;
if ( ${val.data_count} > 0 )
payload_str = transaction_data_to_val(${val.data[0]});