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

Base: Clean up explicit uses of namespaces in places where they're not necessary.

Browse source 
This commit covers all of the common and base classes.
This commit is contained in:
Tim Wojtulewicz 2020-08-21 09:29:37 -07:00
parent 9f802b2a4d
commit fe0c22c789
240 changed files with 6823 additions and 6787 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Frag.cc
View file

@ -26,11 +26,11 @@ void FragTimer::Dispatch(double t, bool /* is_expire */)
if ( f )
f->Expire(t);
else
zeek::reporter->InternalWarning("fragment timer dispatched w/o reassembler");
reporter->InternalWarning("fragment timer dispatched w/o reassembler");
}
FragReassembler::FragReassembler(zeek::NetSessions* arg_s,
const zeek::IP_Hdr* ip, const u_char* pkt,
FragReassembler::FragReassembler(NetSessions* arg_s,
const IP_Hdr* ip, const u_char* pkt,
const FragReassemblerKey& k, double t)
: Reassembler(0, REASSEM_FRAG)
{
@ -59,7 +59,7 @@ FragReassembler::FragReassembler(zeek::NetSessions* arg_s,
if ( frag_timeout != 0.0 )
{
expire_timer = new FragTimer(this, t + frag_timeout);
zeek::detail::timer_mgr->Add(expire_timer);
timer_mgr->Add(expire_timer);
}
else
expire_timer = nullptr;
@ -74,7 +74,7 @@ FragReassembler::~FragReassembler()
delete reassembled_pkt;
}
void FragReassembler::AddFragment(double t, const zeek::IP_Hdr* ip, const u_char* pkt)
void FragReassembler::AddFragment(double t, const IP_Hdr* ip, const u_char* pkt)
{
const struct ip* ip4 = ip->IP4_Hdr();
@ -155,7 +155,7 @@ void FragReassembler::AddFragment(double t, const zeek::IP_Hdr* ip, const u_char
pkt += hdr_len;
len -= hdr_len;
NewBlock(zeek::run_state::network_time, offset, len, pkt);
NewBlock(run_state::network_time, offset, len, pkt);
}
void FragReassembler::Weird(const char* name) const
@ -164,20 +164,20 @@ void FragReassembler::Weird(const char* name) const
if ( version == 4 )
{
zeek::IP_Hdr hdr((const ip*)proto_hdr, false);
IP_Hdr hdr((const ip*)proto_hdr, false);
s->Weird(name, &hdr);
}
else if ( version == 6 )
{
zeek::IP_Hdr hdr((const ip6_hdr*)proto_hdr, false, proto_hdr_len);
IP_Hdr hdr((const ip6_hdr*)proto_hdr, false, proto_hdr_len);
s->Weird(name, &hdr);
}
else
{
zeek::reporter->InternalWarning("Unexpected IP version in FragReassembler");
zeek::reporter->Weird(name);
reporter->InternalWarning("Unexpected IP version in FragReassembler");
reporter->Weird(name);
}
}
@ -277,9 +277,9 @@ void FragReassembler::BlockInserted(DataBlockMap::const_iterator /* it */)
if ( b.upper > n )
{
zeek::reporter->InternalWarning("bad fragment reassembly");
reporter->InternalWarning("bad fragment reassembly");
DeleteTimer();
Expire(zeek::run_state::network_time);
Expire(run_state::network_time);
delete [] pkt_start;
return;
}
@ -296,7 +296,7 @@ void FragReassembler::BlockInserted(DataBlockMap::const_iterator /* it */)
{
struct ip* reassem4 = (struct ip*) pkt_start;
reassem4->ip_len = htons(frag_size + proto_hdr_len);
reassembled_pkt = new zeek::IP_Hdr(reassem4, true);
reassembled_pkt = new IP_Hdr(reassem4, true);
DeleteTimer();
}
@ -304,14 +304,14 @@ void FragReassembler::BlockInserted(DataBlockMap::const_iterator /* it */)
{
struct ip6_hdr* reassem6 = (struct ip6_hdr*) pkt_start;
reassem6->ip6_plen = htons(frag_size + proto_hdr_len - 40);
const zeek::IPv6_Hdr_Chain* chain = new zeek::IPv6_Hdr_Chain(reassem6, next_proto, n);
reassembled_pkt = new zeek::IP_Hdr(reassem6, true, n, chain);
const IPv6_Hdr_Chain* chain = new IPv6_Hdr_Chain(reassem6, next_proto, n);
reassembled_pkt = new IP_Hdr(reassem6, true, n, chain);
DeleteTimer();
}
else
{
zeek::reporter->InternalWarning("bad IP version in fragment reassembly: %d",
reporter->InternalWarning("bad IP version in fragment reassembly: %d",
version);
delete [] pkt_start;
}
@ -323,7 +323,7 @@ void FragReassembler::Expire(double t)
expire_timer->ClearReassembler();
expire_timer = nullptr; // timer manager will delete it
zeek::sessions->Remove(this);
sessions->Remove(this);
}
void FragReassembler::DeleteTimer()
@ -331,7 +331,7 @@ void FragReassembler::DeleteTimer()
if ( expire_timer )
{
expire_timer->ClearReassembler();
zeek::detail::timer_mgr->Cancel(expire_timer);
timer_mgr->Cancel(expire_timer);
expire_timer = nullptr; // timer manager will delete it
}
}