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

Fix duplication of new_connection_contents event

Browse source 
Addresses BIT-1602
This commit is contained in:
Johanna Amann 2016-05-17 10:31:37 -07:00
parent 4851cbc7cc
commit d091e9ca89
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/analyzer/protocol/tcp/TCP.cc
View file

@ -408,11 +408,6 @@ void TCP_Analyzer::EnableReassembly()
TCP_Reassembler::Forward, orig), TCP_Reassembler::Forward, orig),
new TCP_Reassembler(this, this, new TCP_Reassembler(this, this,
TCP_Reassembler::Forward, resp)); TCP_Reassembler::Forward, resp));
reassembling = 1;
if ( new_connection_contents )
Event(new_connection_contents);
} }
void TCP_Analyzer::SetReassembler(TCP_Reassembler* rorig, void TCP_Analyzer::SetReassembler(TCP_Reassembler* rorig,
@ -423,10 +418,10 @@ void TCP_Analyzer::SetReassembler(TCP_Reassembler* rorig,
resp->AddReassembler(rresp); resp->AddReassembler(rresp);
rresp->SetDstAnalyzer(this); rresp->SetDstAnalyzer(this);
reassembling = 1; if ( new_connection_contents && reassembling == 0 )
if ( new_connection_contents )
Event(new_connection_contents); Event(new_connection_contents);
reassembling = 1;
} }
const struct tcphdr* TCP_Analyzer::ExtractTCP_Header(const u_char*& data, const struct tcphdr* TCP_Analyzer::ExtractTCP_Header(const u_char*& data,

2
testing/btest/Baseline/scripts.base.protocols.conn.new_connection_contents/.stdout Normal file
View file

@ -0,0 +1,2 @@
new_connection_contents for [orig_h=192.168.1.77, orig_p=57640/tcp, resp_h=66.198.80.67, resp_p=6667/tcp]
new_connection_contents for [orig_h=192.168.1.77, orig_p=57655/tcp, resp_h=209.197.168.151, resp_p=1024/tcp]

7
testing/btest/scripts/base/protocols/conn/new_connection_contents.bro Normal file
View file

@ -0,0 +1,7 @@
# @TEST-EXEC: bro -r $TRACES/irc-dcc-send.trace %INPUT
# @TEST-EXEC: btest-diff .stdout
event new_connection_contents(c: connection)
{
print fmt("new_connection_contents for %s", cat(c$id));
}