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

The remaining nulls

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-04-02 11:13:07 -07:00
parent 41c3256faa
commit 0a47588d0b
80 changed files with 565 additions and 565 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Frag.cc
View file

@ -49,7 +49,7 @@ FragReassembler::FragReassembler(NetSessions* arg_s,
memcpy(proto_hdr, ip->IP6_Hdr(), proto_hdr_len);
}
reassembled_pkt = 0;
reassembled_pkt = nullptr;
frag_size = 0; // flag meaning "not known"
next_proto = ip->NextProto();
@ -59,7 +59,7 @@ FragReassembler::FragReassembler(NetSessions* arg_s,
timer_mgr->Add(expire_timer);
}
else
expire_timer = 0;
expire_timer = nullptr;
AddFragment(t, ip, pkt);
}
@ -285,7 +285,7 @@ void FragReassembler::BlockInserted(DataBlockMap::const_iterator /* it */)
}
delete reassembled_pkt;
reassembled_pkt = 0;
reassembled_pkt = nullptr;
unsigned int version = ((const struct ip*)pkt_start)->ip_v;
@ -318,7 +318,7 @@ void FragReassembler::Expire(double t)
{
block_list.Clear();
expire_timer->ClearReassembler();
expire_timer = 0; // timer manager will delete it
expire_timer = nullptr; // timer manager will delete it
sessions->Remove(this);
}
@ -329,6 +329,6 @@ void FragReassembler::DeleteTimer()
{
expire_timer->ClearReassembler();
timer_mgr->Cancel(expire_timer);
expire_timer = 0; // timer manager will delete it
expire_timer = nullptr; // timer manager will delete it
}
}