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

Deprecate bro_int_t and bro_uint_t

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-06-28 15:32:26 -07:00
parent d066013793
commit f624c18383
67 changed files with 331 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/analyzer/protocol/bittorrent/BitTorrentTracker.cc
View file

@ -490,7 +490,7 @@ void BitTorrentTracker_Analyzer::ResponseBenc(int name_len, char* name, detail::
}
void BitTorrentTracker_Analyzer::ResponseBenc(int name_len, char* name, detail::BTT_BencTypes type,
bro_int_t value)
zeek_int_t value)
{
auto benc_value = make_intrusive<RecordVal>(bittorrent_benc_value);
auto name_ = make_intrusive<StringVal>(name_len, name);

6
src/analyzer/protocol/bittorrent/BitTorrentTracker.h
View file

@ -90,7 +90,7 @@ protected:
void ResponseBody();
void ResponseBenc(int name_len, char* name, detail::BTT_BencTypes type, int value_len,
char* value);
void ResponseBenc(int name_len, char* name, detail::BTT_BencTypes type, bro_int_t value);
void ResponseBenc(int name_len, char* name, detail::BTT_BencTypes type, zeek_int_t value);
int ResponseParseBenc();
void EmitResponse();
@ -113,7 +113,7 @@ protected:
char res_buf[BTTRACKER_BUF];
char* res_buf_pos;
unsigned int res_buf_len;
bro_uint_t res_status;
zeek_uint_t res_status;
TableVal* res_val_headers;
TableVal* res_val_peers;
TableVal* res_val_benc;
@ -135,7 +135,7 @@ protected:
unsigned int benc_str_have;
char* benc_int;
bro_int_t benc_int_val;
zeek_int_t benc_int_val;
// True on protocol violation.
bool stop_orig, stop_resp;

2
src/analyzer/protocol/krb/KRB.cc
View file

@ -88,7 +88,7 @@ void KRB_Analyzer::DeliverPacket(int len, const u_char* data, bool orig, uint64_
}
StringValPtr KRB_Analyzer::GetAuthenticationInfo(const String* principal, const String* ciphertext,
const bro_uint_t enctype)
const zeek_uint_t enctype)
{
#ifdef USE_KRB5
if ( ! krb_available )

2
src/analyzer/protocol/krb/KRB.h
View file

@ -29,7 +29,7 @@ public:
static analyzer::Analyzer* Instantiate(Connection* conn) { return new KRB_Analyzer(conn); }
StringValPtr GetAuthenticationInfo(const String* principal, const String* ciphertext,
const bro_uint_t enctype);
const zeek_uint_t enctype);
protected:
binpac::KRB::KRB_Conn* interp;

2
src/analyzer/protocol/krb/KRB_TCP.h
View file

@ -24,7 +24,7 @@ public:
void EndpointEOF(bool is_orig) override;
StringValPtr GetAuthenticationInfo(const String* principal, const String* ciphertext,
const bro_uint_t enctype)
const zeek_uint_t enctype)
{
return val_mgr->EmptyString();
}

4
src/analyzer/protocol/rpc/NFS.cc
View file

@ -177,7 +177,7 @@ bool NFS_Interp::RPC_BuildReply(RPC_CallInfo* c, BifEnum::rpc_status rpc_status,
break;
case BifEnum::NFS3::PROC_READ:
bro_uint_t offset;
zeek_uint_t offset;
offset = c->RequestVal()->AsRecordVal()->GetFieldAs<CountVal>(1);
reply = nfs3_read_reply(buf, n, nfs_status, offset);
event = nfs_proc_read;
@ -546,7 +546,7 @@ RecordValPtr NFS_Interp::nfs3_readargs(const u_char*& buf, int& n)
}
RecordValPtr NFS_Interp::nfs3_read_reply(const u_char*& buf, int& n, BifEnum::NFS3::status_t status,
bro_uint_t offset)
zeek_uint_t offset)
{
auto rep = make_intrusive<RecordVal>(BifType::Record::NFS3::read_reply_t);

2
src/analyzer/protocol/rpc/NFS.h
View file

@ -53,7 +53,7 @@ protected:
RecordValPtr nfs3_lookup_reply(const u_char*& buf, int& n, BifEnum::NFS3::status_t status);
RecordValPtr nfs3_readargs(const u_char*& buf, int& n);
RecordValPtr nfs3_read_reply(const u_char*& buf, int& n, BifEnum::NFS3::status_t status,
bro_uint_t offset);
zeek_uint_t offset);
RecordValPtr nfs3_readlink_reply(const u_char*& buf, int& n, BifEnum::NFS3::status_t status);
RecordValPtr nfs3_link_reply(const u_char*& buf, int& n, BifEnum::NFS3::status_t status);
RecordValPtr nfs3_writeargs(const u_char*& buf, int& n);