Merge remote branch 'origin/topic/seth/net-stats-bif'

* origin/topic/seth/net-stats-bif:
  Removing a stray print statement.
  Changed netstats (packet loss) handling to script-land.

Nice idea to pass the old data into a regular scheduled event!

Conflicts:
	src/event.bif
This commit is contained in:
Robin Sommer 2011-06-25 17:01:04 -07:00
commit 6d2a89f1f8
10 changed files with 77 additions and 177 deletions

View file

@ -75,7 +75,7 @@ public:
void DispatchPacket(double t, const struct pcap_pkthdr* hdr,
const u_char* const pkt, int hdr_size,
PktSrc* src_ps, PacketSortElement* pkt_elem);
void Done(); // call to drain events before destructing
// Returns a reassembled packet, or nil if there are still
@ -105,9 +105,6 @@ public:
// that are still active.
void Drain();
// Called periodically to generate statistics reports.
void HeartBeat(double t);
void GetStats(SessionStats& s) const;
void Weird(const char* name,
@ -177,7 +174,7 @@ protected:
void NextPacket(double t, const struct pcap_pkthdr* hdr,
const u_char* const pkt, int hdr_size,
PacketSortElement* pkt_elem);
void DoNextPacket(double t, const struct pcap_pkthdr* hdr,
const IP_Hdr* ip_hdr, const u_char* const pkt,
int hdr_size);
@ -185,7 +182,7 @@ protected:
void NextPacketSecondary(double t, const struct pcap_pkthdr* hdr,
const u_char* const pkt, int hdr_size,
const PktSrc* src_ps);
// Record the given packet (if a dumper is active). If len=0
// then the whole packet is recorded, otherwise just the first
// len bytes.