Merge pull request elastic#485 from Shweta-Bhandare/addSMTPSenderRece…

…iverDomains

Re-add sender and receiver domain for SMTP.

protofiles/DpiMsgLRproto.proto

@@ -2007,9 +2007,9 @@ repeated bytes passwordQ_PROTO_SMTP = 2261; // QOSMOS:Q_PROTO_SMTP,Q_MPA_PASSWOR
 repeated bytes sender_aliasQ_PROTO_SMTP = 2263; // QOSMOS:Q_PROTO_SMTP,Q_MPA_SENDER_ALIAS
 repeated bytes sender_emailQ_PROTO_SMTP = 2264; // QOSMOS:Q_PROTO_SMTP,Q_MPA_SENDER_EMAIL
 //repeated bytes sender_mailfromQ_PROTO_SMTP = 2265; // QOSMOS:Q_PROTO_SMTP,Q_SMTP_SENDER_MAILFROM
-//repeated bytes sender_domainQ_PROTO_SMTP = 2266; // QOSMOS:Q_PROTO_SMTP,Q_SMTP_SENDER_DOMAIN
+repeated bytes sender_domainQ_PROTO_SMTP = 2266; // QOSMOS:Q_PROTO_SMTP,Q_SMTP_SENDER_DOMAIN
 //repeated bytes receiver_rcpttoQ_PROTO_SMTP = 2267; // QOSMOS:Q_PROTO_SMTP,Q_SMTP_RECEIVER_RCPTTO
-//repeated bytes receiver_domainQ_PROTO_SMTP = 2268; // QOSMOS:Q_PROTO_SMTP,Q_SMTP_RECEIVER_DOMAIN
+repeated bytes receiver_domainQ_PROTO_SMTP = 2268; // QOSMOS:Q_PROTO_SMTP,Q_SMTP_RECEIVER_DOMAIN
 //repeated bytes receiverQ_PROTO_SMTP = 2269; // QOSMOS:Q_PROTO_SMTP,Q_MPA_RECEIVER
 //repeated bytes receiver_aliasQ_PROTO_SMTP = 2270; // QOSMOS:Q_PROTO_SMTP,Q_MPA_RECEIVER_ALIAS
 repeated bytes receiver_emailQ_PROTO_SMTP = 2271; // QOSMOS:Q_PROTO_SMTP,Q_MPA_RECEIVER_EMAIL

resources/LuaProtoFieldsDesc.csv

@@ -1410,6 +1410,8 @@ smtp, Simple Mail Transfer Protocol, login, loginq_proto_smtp, bytes, "User's lo
 smtp, Simple Mail Transfer Protocol, password, passwordq_proto_smtp, bytes, "User's password string."
 smtp, Simple Mail Transfer Protocol, sender_alias, sender_aliasq_proto_smtp, bytes, "Name of the email sender."
 smtp, Simple Mail Transfer Protocol, sender_email, sender_emailq_proto_smtp, bytes, "Email address of the email sender."
+smtp, Simple Mail Transfer Protocol, sender_domain, sender_domainq_proto_smtp, bytes, "Domain of the sender's email address."
+smtp, Simple Mail Transfer Protocol, receiver_domain, receiver_domainq_proto_smtp, bytes, "Domain of the recipient's email address."
 smtp, Simple Mail Transfer Protocol, receiver_email, receiver_emailq_proto_smtp, bytes, "Email address of message receiver (included cc and bcc receivers)."
 smtp, Simple Mail Transfer Protocol, method, methodq_proto_smtp, bytes, "Command sent by the client"
 smtp, Simple Mail Transfer Protocol, response_code, response_codeq_proto_smtp, uint32, "Return code"

resources/ProtocolFilters

@@ -1740,9 +1740,7 @@
 ![,:]Q_PROTO_SMTP.*,Q_MPA_REPLYTO[,\n]|
 ![,:]Q_PROTO_SMTP.*,Q_MPA_SENDER[,\n]|
 ![,:]Q_PROTO_SMTP.*,Q_MPA_XMAILER[,\n]|
-![,:]Q_PROTO_SMTP.*,Q_SMTP_RECEIVER_DOMAIN[,\n]|
 ![,:]Q_PROTO_SMTP.*,Q_SMTP_RECEIVER_RCPTTO[,\n]|
-![,:]Q_PROTO_SMTP.*,Q_SMTP_SENDER_DOMAIN[,\n]|
 ![,:]Q_PROTO_SMTP.*,Q_SMTP_SENDER_MAILFROM[,\n]|
 ![,:]Q_PROTO_SMTP.*,Q_SMTP_SERVER_AGENT[,\n]|
 ![,:]Q_PROTO_SNAP.*,Q_SNAP_SNAP_TYPE[,\n]|