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

migration to using new differentiated methods for setting record fields

Browse source
This commit is contained in:
Vern Paxson 2021-02-25 16:59:26 -08:00
parent 4213245633
commit 62bab66114
74 changed files with 982 additions and 988 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/analyzer/protocol/tcp/TCP.cc
View file

@ -109,14 +109,14 @@ static RecordVal* build_syn_packet_val(bool is_orig, const IP_Hdr* ip,
static auto SYN_packet = id::find_type<RecordType>("SYN_packet");
auto* v = new RecordVal(SYN_packet);
v->Assign(0, val_mgr->Bool(is_orig));
v->Assign(1, val_mgr->Bool(int(ip->DF())));
v->Assign(2, val_mgr->Count((ip->TTL())));
v->Assign(3, val_mgr->Count((ip->TotalLen())));
v->Assign(4, val_mgr->Count(ntohs(tcp->th_win)));
v->Assign(5, val_mgr->Int(winscale));
v->Assign(6, val_mgr->Count(MSS));
v->Assign(7, val_mgr->Bool(SACK));
v->Assign(0, bool(is_orig));
v->Assign(1, bool(int(ip->DF())));
v->Assign(2, uint32_t(ip->TTL()));
v->Assign(3, uint32_t((ip->TotalLen())));
v->Assign(4, uint32_t(ntohs(tcp->th_win)));
v->Assign(5, int(winscale));
v->Assign(6, uint32_t(MSS));
v->Assign(7, bool(SACK));
return v;
}
@ -1285,10 +1285,10 @@ void TCP_Analyzer::UpdateConnVal(RecordVal *conn_val)
auto orig_endp_val = conn_val->GetFieldAs<RecordVal>("orig");
auto resp_endp_val = conn_val->GetFieldAs<RecordVal>("resp");
orig_endp_val->Assign(0, val_mgr->Count(orig->Size()));
orig_endp_val->Assign(1, val_mgr->Count(int(orig->state)));
resp_endp_val->Assign(0, val_mgr->Count(resp->Size()));
resp_endp_val->Assign(1, val_mgr->Count(int(resp->state)));
orig_endp_val->Assign(0, orig->Size());
orig_endp_val->Assign(1, int(orig->state));
resp_endp_val->Assign(0, resp->Size());
resp_endp_val->Assign(1, int(resp->state));
// Call children's UpdateConnVal
Analyzer::UpdateConnVal(conn_val);
@ -1369,8 +1369,8 @@ int TCP_Analyzer::ParseTCPOptions(const struct tcphdr* tcp, bool is_orig)
auto length = kind < 2 ? 1 : o[1];
auto option_record = make_intrusive<RecordVal>(BifType::Record::TCP::Option);
option_list->Assign(option_list->Size(), option_record);
option_record->Assign(0, val_mgr->Count(kind));
option_record->Assign(1, val_mgr->Count(length));
option_record->Assign(0, uint32_t(kind));
option_record->Assign(1, uint32_t(length));
switch ( kind ) {
case 2:
@ -1378,7 +1378,7 @@ int TCP_Analyzer::ParseTCPOptions(const struct tcphdr* tcp, bool is_orig)
if ( length == 4 )
{
auto mss = ntohs(*reinterpret_cast<const uint16_t*>(o + 2));
option_record->Assign(3, val_mgr->Count(mss));
option_record->Assign(3, uint32_t(mss));
}
else
{
@ -1392,7 +1392,7 @@ int TCP_Analyzer::ParseTCPOptions(const struct tcphdr* tcp, bool is_orig)
if ( length == 3 )
{
auto scale = o[2];
option_record->Assign(4, val_mgr->Count(scale));
option_record->Assign(4, uint32_t(scale));
}
else
{
@ -1438,8 +1438,8 @@ int TCP_Analyzer::ParseTCPOptions(const struct tcphdr* tcp, bool is_orig)
{
auto send = ntohl(*reinterpret_cast<const uint32_t*>(o + 2));
auto echo = ntohl(*reinterpret_cast<const uint32_t*>(o + 6));
option_record->Assign(6, val_mgr->Count(send));
option_record->Assign(7, val_mgr->Count(echo));
option_record->Assign(6, uint32_t(send));
option_record->Assign(7, uint32_t(echo));
}
else
{
@ -2076,13 +2076,13 @@ RecordVal* TCPStats_Endpoint::BuildStats()
static auto endpoint_stats = id::find_type<RecordType>("endpoint_stats");
auto* stats = new RecordVal(endpoint_stats);
stats->Assign(0, val_mgr->Count(num_pkts));
stats->Assign(1, val_mgr->Count(num_rxmit));
stats->Assign(2, val_mgr->Count(num_rxmit_bytes));
stats->Assign(3, val_mgr->Count(num_in_order));
stats->Assign(4, val_mgr->Count(num_OO));
stats->Assign(5, val_mgr->Count(num_repl));
stats->Assign(6, val_mgr->Count(endian_type));
stats->Assign(0, num_pkts);
stats->Assign(1, num_rxmit);
stats->Assign(2, num_rxmit_bytes);
stats->Assign(3, num_in_order);
stats->Assign(4, num_OO);
stats->Assign(5, num_repl);
stats->Assign(6, endian_type);
return stats;
}