Rewrote SMTP command sending. Better code for pipelining. Report full command text on MAIL/RCPT errors.

1 files changed, 155 insertions, 0 deletions

diff --git a/src/net/smtp/SMTPCommand.cpp b/src/net/smtp/SMTPCommand.cpp
new file mode 100644
index 00000000..13b1dc5d
--- /dev/null
+++ b/src/net/smtp/SMTPCommand.cpp
@@ -0,0 +1,155 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 Vincent Richard <[email protected]>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "vmime/config.hpp"
+
+
+#if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP
+
+
+#include "vmime/net/smtp/SMTPCommand.hpp"
+
+#include "vmime/net/socket.hpp"
+
+#include "vmime/mailbox.hpp"
+
+
+namespace vmime {
+namespace net {
+namespace smtp {
+
+
+SMTPCommand::SMTPCommand(const std::string& text)
+	: m_text(text)
+{
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::EHLO(const std::string& hostname)
+{
+	std::ostringstream cmd;
+	cmd.imbue(std::locale::classic());
+	cmd << "EHLO " << hostname;
+
+	return createCommand(cmd.str());
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::HELO(const std::string& hostname)
+{
+	std::ostringstream cmd;
+	cmd.imbue(std::locale::classic());
+	cmd << "HELO " << hostname;
+
+	return createCommand(cmd.str());
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::AUTH(const std::string& mechName)
+{
+	std::ostringstream cmd;
+	cmd.imbue(std::locale::classic());
+	cmd << "AUTH " << mechName;
+
+	return createCommand(cmd.str());
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::STARTTLS()
+{
+	return createCommand("STARTTLS");
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::MAIL(const mailbox& mbox)
+{
+	std::ostringstream cmd;
+	cmd.imbue(std::locale::classic());
+	cmd << "MAIL FROM:<" << mbox.getEmail() << ">";
+
+	return createCommand(cmd.str());
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::RCPT(const mailbox& mbox)
+{
+	std::ostringstream cmd;
+	cmd.imbue(std::locale::classic());
+	cmd << "RCPT TO:<" << mbox.getEmail() << ">";
+
+	return createCommand(cmd.str());
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::DATA()
+{
+	return createCommand("DATA");
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::NOOP()
+{
+	return createCommand("NOOP");
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::QUIT()
+{
+	return createCommand("QUIT");
+}
+
+
+// static
+ref <SMTPCommand> SMTPCommand::createCommand(const std::string& text)
+{
+	return vmime::create <SMTPCommand>(text);
+}
+
+
+const string SMTPCommand::getText() const
+{
+	return m_text;
+}
+
+
+void SMTPCommand::writeToSocket(ref <socket> sok)
+{
+	sok->send(m_text + "\r\n");
+}
+
+
+} // smtp
+} // net
+} // vmime
+
+
+#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP