Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3

This commit is contained in:
Robin Sommer 2014-06-13 08:27:10 -07:00
commit ba7af428a7
133 changed files with 3382 additions and 1381 deletions

View file

@ -7,6 +7,7 @@
using namespace std;
#include "analyzer/protocol/tcp/TCP.h"
#include "analyzer/protocol/tcp/ContentLine.h"
#include "analyzer/protocol/mime/MIME.h"
#undef SMTP_CMD_DEF
@ -74,6 +75,7 @@ protected:
int detail_len, const char* detail);
void UnexpectedCommand(const int cmd_code, const int reply_code);
void UnexpectedReply(const int cmd_code, const int reply_code);
void StartTLS();
bool orig_is_sender;
int expect_sender, expect_recver;
@ -88,6 +90,10 @@ protected:
// after a gap
mime::MIME_Mail* mail;
private:
tcp::ContentLine_Analyzer* cl_orig;
tcp::ContentLine_Analyzer* cl_resp;
};
} } // namespace analyzer::*