Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 21:48:21 +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:
  Better multi-space separator handling.

Also tweak multi-space separator handline some more and add test-case
triggering the new behavior.
This commit is contained in:
Johanna Amann 2016-02-12 18:53:35 -08:00
commit baa3cd986c
7 changed files with 53 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/analyzer/protocol/irc/IRC.h
View file

@ -22,7 +22,7 @@ public:
/**
* \brief Called when connection is closed.
*/
virtual void Done();
void Done() override;
/**
* \brief New input line in network stream.
@ -31,7 +31,7 @@ public:
* \param data pointer to line start
* \param orig was this data sent from connection originator?
*/
virtual void DeliverStream(int len, const u_char* data, bool orig);
void DeliverStream(int len, const u_char* data, bool orig) override;
static analyzer::Analyzer* Instantiate(Connection* conn)
{
@ -47,6 +47,8 @@ protected:
private:
void StartTLS();
inline void SkipLeadingWhitespace(string& str);
/** \brief counts number of invalid IRC messages */
int invalid_msg_count;