Merge branch 'topic/robin/dynamic-plugins-2.3' of git.bro.org:bro into topic/robin/dynamic-plugins-2.3

This commit is contained in:
Robin Sommer 2014-06-18 14:41:40 -07:00
commit 62d07a3fc4
131 changed files with 5188 additions and 899 deletions

View file

@ -52,7 +52,7 @@ void Foo::DeliverStream(int len, const u_char* data, bool orig)
}
}
void Foo::Undelivered(int seq, int len, bool orig)
void Foo::Undelivered(uint64 seq, int len, bool orig)
{
analyzer::tcp::TCP_ApplicationAnalyzer::Undelivered(seq, len, orig);
interp->NewGap(orig, len);

View file

@ -17,7 +17,7 @@ public:
virtual void Done();
virtual void DeliverStream(int len, const u_char* data, bool orig);
virtual void Undelivered(int seq, int len, bool orig);
virtual void Undelivered(uint64 seq, int len, bool orig);
virtual void EndpointEOF(bool is_orig);
static analyzer::Analyzer* Instantiate(Connection* conn)