GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Editorial changes in DSN attributes

Browse Source
This commit is contained in:
Jan Osusky 2020-08-21 13:13:55 +02:00
parent 64ef65e03c
commit d4cc5cfc9b
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vmime/net/dsnAttributes.cpp
View File

@ -34,25 +34,25 @@ namespace vmime {
namespace net { namespace net {
dsnAttributes::dsnAttributes(string dsnNotify, string dsnRet, string dsnEnvelopId) dsnAttributes::dsnAttributes(const string& dsnNotify, const string& dsnRet, const string& dsnEnvelopId)
: m_notifications(dsnNotify), m_returnFormat(dsnRet), m_envelopId(dsnEnvelopId) { : m_notifications(dsnNotify), m_returnFormat(dsnRet), m_envelopId(dsnEnvelopId) {
} }
string dsnAttributes::notificationConditions() const { string dsnAttributes::getNotificationConditions() const {
return m_notifications; return m_notifications;
} }
string dsnAttributes::returnFormat() const { string dsnAttributes::getReturnFormat() const {
return m_returnFormat; return m_returnFormat;
} }
string dsnAttributes::envelopId() const { string dsnAttributes::getEnvelopId() const {
return m_envelopId; return m_envelopId;
} }

8
src/vmime/net/dsnAttributes.hpp
View File

@ -70,25 +70,25 @@ public:
* @param dsnRet content of DSN - full message or headers only ("FULL" or "HDRS") * @param dsnRet content of DSN - full message or headers only ("FULL" or "HDRS")
* @param dsnEnvelopId envelop ID to be able to pair the DSN with original message (plain text not in "<" ">") * @param dsnEnvelopId envelop ID to be able to pair the DSN with original message (plain text not in "<" ">")
*/ */
dsnAttributes(string dsnNotify, string dsnRet, string dsnEnvelopId); dsnAttributes(const string& dsnNotify, const string& dsnRet, const string& dsnEnvelopId);
/** Returns comma separated list of notification conditions as specified in RFC 1891 /** Returns comma separated list of notification conditions as specified in RFC 1891
* *
* @return comma separated list of notification conditions as specified in RFC 1891 * @return comma separated list of notification conditions as specified in RFC 1891
*/ */
string notificationConditions() const; string getNotificationConditions() const;
/** Returns requested format of the notification (RET parameter of the ESMTP MAIL command). /** Returns requested format of the notification (RET parameter of the ESMTP MAIL command).
* *
* @return requested format of the notification. * @return requested format of the notification.
*/ */
string returnFormat() const; string getReturnFormat() const;
/** Returns envelop ID used pair the DSN with the original message. /** Returns envelop ID used pair the DSN with the original message.
* *
* @return envelop ID used pair the DSN with the original message. * @return envelop ID used pair the DSN with the original message.
*/ */
string envelopId() const; string getEnvelopId() const;
private: private:

10
src/vmime/net/smtp/SMTPTransport.cpp
View File

@ -231,8 +231,8 @@ void SMTPTransport::sendEnvelope(
commands->addCommand( commands->addCommand(
SMTPCommand::MAIL( SMTPCommand::MAIL(
sender, hasSMTPUTF8 && needSMTPUTF8, hasSize ? size : 0, sender, hasSMTPUTF8 && needSMTPUTF8, hasSize ? size : 0,
dsnAttrs.notificationConditions(), dsnAttrs.getNotificationConditions(),
dsnAttrs.envelopId() dsnAttrs.getEnvelopId()
) )
); );
@ -241,8 +241,8 @@ void SMTPTransport::sendEnvelope(
commands->addCommand( commands->addCommand(
SMTPCommand::MAIL( SMTPCommand::MAIL(
expeditor, hasSMTPUTF8 && needSMTPUTF8, hasSize ? size : 0, expeditor, hasSMTPUTF8 && needSMTPUTF8, hasSize ? size : 0,
dsnAttrs.notificationConditions(), dsnAttrs.getNotificationConditions(),
dsnAttrs.envelopId() dsnAttrs.getEnvelopId()
) )
); );
} }
@ -255,7 +255,7 @@ void SMTPTransport::sendEnvelope(
const mailbox& mbox = *recipients.getMailboxAt(i); const mailbox& mbox = *recipients.getMailboxAt(i);
commands->addCommand(SMTPCommand::RCPT(mbox, hasSMTPUTF8 && needSMTPUTF8, commands->addCommand(SMTPCommand::RCPT(mbox, hasSMTPUTF8 && needSMTPUTF8,
dsnAttrs.notificationConditions())); dsnAttrs.getNotificationConditions()));
} }
// Prepare sending of message data // Prepare sending of message data