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

Merging in 'topic/robin/cleanup-rewriter'.

Browse source 
Removing everything related to trace rewriting.

(I wasn't too careful in ensuring that I catch everything in the
scripts; Seth is working on those anyway.)

(Merging by cherry-picking the corresponding commit, as the branch was
accidentally made off of the logging stuff).
This commit is contained in:
Robin Sommer 2011-04-01 15:23:50 -07:00
parent ec1b2b4d2a
commit a3a075174b
70 changed files with 20 additions and 5922 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Sessions.cc
View file

@ -632,13 +632,6 @@ void NetSessions::DoNextPacket(double t, const struct pcap_pkthdr* hdr,
record_packet, record_content,
hdr, pkt, hdr_size);
// Override content record setting according to
// flags set by the policy script.
if ( BifConst::dump_original_packets_if_not_rewriting )
record_packet = record_content = 1;
if ( BifConst::dump_selected_source_packets )
record_packet = record_content = 0;
if ( f )
{
// Above we already recorded the fragment in its entirety.
@ -646,7 +639,7 @@ void NetSessions::DoNextPacket(double t, const struct pcap_pkthdr* hdr,
Remove(f); // ###
}
else if ( record_packet && ! conn->RewritingTrace() )
else if ( record_packet )
{
if ( record_content )
dump_this_packet = 1; // save the whole thing