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

Merge remote-tracking branch 'origin/topic/vladg/fix_binpac_proto_violation'

Browse source 
* origin/topic/vladg/fix_binpac_proto_violation:
  Make BinPAC exception handling more consistent

BIT-1930 #merged
This commit is contained in:
Jon Siwek 2018-05-03 14:59:53 -05:00
commit 091d1e163f
8 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.5-553 | 2018-05-03 14:59:53 -0500
* Make BinPAC exception handling more consistent (Vlad Grigorescu)
2.5-551 | 2018-05-01 18:27:38 -0500
* Fix the ip-broken-header.bro test on macOS due to missing 'xzcat'

2
VERSION
View file

@ -1 +1 @@
2.5-551
2.5-553

2
src/analyzer/protocol/krb/KRB.cc
View file

@ -33,7 +33,7 @@ void KRB_Analyzer::DeliverPacket(int len, const u_char* data, bool orig,
}
catch ( const binpac::Exception& e )
{
ProtocolViolation(e.c_msg());
ProtocolViolation(fmt("Binpac exception: %s", e.c_msg()));
}
}

2
src/analyzer/protocol/krb/KRB_TCP.cc
View file

@ -53,7 +53,7 @@ void KRB_Analyzer::DeliverStream(int len, const u_char* data, bool orig)
}
catch ( const binpac::Exception& e )
{
ProtocolViolation(e.c_msg());
ProtocolViolation(fmt("Binpac exception: %s", e.c_msg()));
}
}

2
src/analyzer/protocol/mysql/MySQL.cc
View file

@ -53,7 +53,7 @@ void MySQL_Analyzer::DeliverStream(int len, const u_char* data, bool orig)
}
catch ( const binpac::Exception& e )
{
reporter->Weird(e.msg().c_str());
ProtocolViolation(fmt("Binpac exception: %s", e.c_msg()));
}
}

2
src/analyzer/protocol/ncp/NCP.cc
View file

@ -40,7 +40,7 @@ void NCP_Session::Deliver(int is_orig, int len, const u_char* data)
}
catch ( const binpac::Exception& e )
{
analyzer->Weird(e.msg().c_str());
analyzer->ProtocolViolation(fmt("Binpac exception: %s", e.c_msg()));
}
}

3
src/analyzer/protocol/sip/SIP_TCP.cc
View file

@ -55,8 +55,7 @@ void SIP_Analyzer::DeliverStream(int len, const u_char* data, bool orig)
}
catch ( const binpac::Exception& e )
{
printf("BinPAC Exception: %s\n", e.c_msg());
ProtocolViolation(e.c_msg());
ProtocolViolation(fmt("Binpac exception: %s", e.c_msg()));
}
}

2
src/analyzer/protocol/snmp/SNMP.cc
View file

@ -35,6 +35,6 @@ void SNMP_Analyzer::DeliverPacket(int len, const u_char* data, bool orig,
}
catch ( const binpac::Exception& e )
{
ProtocolViolation(e.c_msg());
ProtocolViolation(fmt("Binpac exception: %s", e.c_msg()));
}
}