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

Merge branch 'master' of https://github.com/marktayl/bro

Browse source 
* 'master' of https://github.com/marktayl/bro:
  Allow IRC commands to not have parameters.

Also update test baseline.
This commit is contained in:
Johanna Amann 2016-02-10 21:29:33 -08:00
commit 9d1a764ef7
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/analyzer/protocol/irc/IRC.cc
View file

@ -55,7 +55,7 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
return;
}
string myline = string((const char*) line);
string myline = string((const char*) line, length);
// Check for prefix.
string prefix = "";
@ -106,28 +106,29 @@ void IRC_Analyzer::DeliverStream(int length, const u_char* line, bool orig)
}
else
{ // get command
// special case that has no arguments
if ( myline == "STARTTLS" )
return;
unsigned int pos = myline.find(' ');
// Not all commands require parameters
if ( pos > (unsigned int) length )
{
Weird("irc_invalid_line");
return;
}
pos = (unsigned int) length;
command = myline.substr(0, pos);
for ( unsigned int i = 0; i < command.size(); ++i )
command[i] = toupper(command[i]);
// Adjust for the no-parameter case
if ( pos == (unsigned int) length )
pos--;
myline = myline.substr(pos + 1);
}
// Extract parameters.
string params = myline;
// special case
if ( command == "STARTTLS" )
return;
// Check for Server2Server - connections with ZIP enabled.
if ( orig && orig_status == WAIT_FOR_REGISTRATION )
{