mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
ConnStats: Expose num_packets_unprocessed
Not sure it's the best place to put, but we don't have packet analysis stats bif and also num_packets is already there, so seems reasonable to put the num_packets_unprocessed into
This commit is contained in:
parent
fa476746bf
commit
120f061bcd
6 changed files with 20 additions and 3 deletions
|
@ -1092,6 +1092,7 @@ type ConnStats: record {
|
||||||
num_icmp_conns: count; ##< Current number of ICMP flows in memory.
|
num_icmp_conns: count; ##< Current number of ICMP flows in memory.
|
||||||
max_icmp_conns: count; ##< Maximum number of concurrent ICMP flows so far.
|
max_icmp_conns: count; ##< Maximum number of concurrent ICMP flows so far.
|
||||||
cumulative_icmp_conns: count; ##< Total number of ICMP flows so far.
|
cumulative_icmp_conns: count; ##< Total number of ICMP flows so far.
|
||||||
|
num_packets_unprocessed: count; ##< Total number of packets not processed by any analyzer.
|
||||||
|
|
||||||
killed_by_inactivity: count;
|
killed_by_inactivity: count;
|
||||||
};
|
};
|
||||||
|
|
|
@ -218,6 +218,7 @@ void Manager::GetStats(Stats& s) {
|
||||||
s.num_fragments = zeek::detail::fragment_mgr->Size();
|
s.num_fragments = zeek::detail::fragment_mgr->Size();
|
||||||
s.max_fragments = zeek::detail::fragment_mgr->MaxFragments();
|
s.max_fragments = zeek::detail::fragment_mgr->MaxFragments();
|
||||||
s.num_packets = packet_mgr->PacketsProcessed();
|
s.num_packets = packet_mgr->PacketsProcessed();
|
||||||
|
s.num_packets_unprocessed = packet_mgr->PacketsUnprocessed();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Manager::Weird(const char* name, const Packet* pkt, const char* addl, const char* source) {
|
void Manager::Weird(const char* name, const Packet* pkt, const char* addl, const char* source) {
|
||||||
|
|
|
@ -50,6 +50,7 @@ struct Stats {
|
||||||
size_t num_fragments;
|
size_t num_fragments;
|
||||||
size_t max_fragments;
|
size_t max_fragments;
|
||||||
uint64_t num_packets;
|
uint64_t num_packets;
|
||||||
|
uint64_t num_packets_unprocessed;
|
||||||
};
|
};
|
||||||
|
|
||||||
class Manager final {
|
class Manager final {
|
||||||
|
|
|
@ -101,10 +101,11 @@ function get_conn_stats%(%): ConnStats
|
||||||
r->Assign(n++, static_cast<uint64_t>(s.num_ICMP_conns));
|
r->Assign(n++, static_cast<uint64_t>(s.num_ICMP_conns));
|
||||||
r->Assign(n++, static_cast<uint64_t>(s.max_ICMP_conns));
|
r->Assign(n++, static_cast<uint64_t>(s.max_ICMP_conns));
|
||||||
r->Assign(n++, static_cast<uint64_t>(s.cumulative_ICMP_conns));
|
r->Assign(n++, static_cast<uint64_t>(s.cumulative_ICMP_conns));
|
||||||
|
r->Assign(n++, static_cast<uint64_t>(s.num_packets_unprocessed));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Skip all of the fields that would be set from session_mgr data.
|
// Skip all of the fields that would be set from session_mgr data.
|
||||||
n += 13;
|
n += 14;
|
||||||
}
|
}
|
||||||
|
|
||||||
r->Assign(n++, zeek::detail::killed_by_inactivity);
|
r->Assign(n++, zeek::detail::killed_by_inactivity);
|
||||||
|
|
|
@ -1,2 +1,7 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
||||||
[total_conns=9, current_conns=5, sess_current_conns=5, num_packets=125, num_fragments=0, max_fragments=0, num_tcp_conns=5, max_tcp_conns=5, cumulative_tcp_conns=6, num_udp_conns=0, max_udp_conns=2, cumulative_udp_conns=2, num_icmp_conns=0, max_icmp_conns=1, cumulative_icmp_conns=1, killed_by_inactivity=3]
|
pcap smtp.trace
|
||||||
|
[total_conns=9, current_conns=5, sess_current_conns=5, num_packets=125, num_fragments=0, max_fragments=0, num_tcp_conns=5, max_tcp_conns=5, cumulative_tcp_conns=6, num_udp_conns=0, max_udp_conns=2, cumulative_udp_conns=2, num_icmp_conns=0, max_icmp_conns=1, cumulative_icmp_conns=1, num_packets_unprocessed=0, killed_by_inactivity=3]
|
||||||
|
pcap dns-edns-ecs.pcap
|
||||||
|
[total_conns=69, current_conns=9, sess_current_conns=9, num_packets=89, num_fragments=0, max_fragments=1, num_tcp_conns=1, max_tcp_conns=6, cumulative_tcp_conns=8, num_udp_conns=8, max_udp_conns=37, cumulative_udp_conns=61, num_icmp_conns=0, max_icmp_conns=0, cumulative_icmp_conns=0, num_packets_unprocessed=4, killed_by_inactivity=59]
|
||||||
|
pcap contentline-irc-5k-line.pcap
|
||||||
|
[total_conns=0, current_conns=0, sess_current_conns=0, num_packets=118, num_fragments=0, max_fragments=0, num_tcp_conns=0, max_tcp_conns=0, cumulative_tcp_conns=0, num_udp_conns=0, max_udp_conns=0, cumulative_udp_conns=0, num_icmp_conns=0, max_icmp_conns=0, cumulative_icmp_conns=0, num_packets_unprocessed=118, killed_by_inactivity=0]
|
||||||
|
|
|
@ -1,6 +1,14 @@
|
||||||
# @TEST-EXEC: zeek -b -r $TRACES/smtp.trace %INPUT
|
# @TEST-EXEC: zeek -b -r $TRACES/smtp.trace %INPUT
|
||||||
|
# @TEST-EXEC: zeek -b -r $TRACES/dns-edns-ecs.pcap %INPUT
|
||||||
|
# @TEST-EXEC: zeek -b -r $TRACES/contentline-irc-5k-line.pcap %INPUT
|
||||||
|
#
|
||||||
# @TEST-EXEC: btest-diff .stdout
|
# @TEST-EXEC: btest-diff .stdout
|
||||||
|
|
||||||
|
event zeek_init()
|
||||||
|
{
|
||||||
|
print fmt("pcap %s", split_string(packet_source()$path, /\//)[-1]);
|
||||||
|
}
|
||||||
|
|
||||||
event net_done(t: time)
|
event net_done(t: time)
|
||||||
{
|
{
|
||||||
print get_conn_stats();
|
print get_conn_stats();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue