aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp145
-rw-r--r--src/net/smtp/SMTPCommand.cpp14
-rw-r--r--src/net/smtp/SMTPTransport.cpp72
3 files changed, 212 insertions, 19 deletions
diff --git a/src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp b/src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp
new file mode 100644
index 00000000..2561bf4a
--- /dev/null
+++ b/src/net/smtp/SMTPChunkingOutputStreamAdapter.cpp
@@ -0,0 +1,145 @@
+//
+// 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/SMTPChunkingOutputStreamAdapter.hpp"
+
+#include "vmime/net/smtp/SMTPConnection.hpp"
+#include "vmime/net/smtp/SMTPTransport.hpp"
+
+#include <algorithm>
+
+
+namespace vmime {
+namespace net {
+namespace smtp {
+
+
+SMTPChunkingOutputStreamAdapter::SMTPChunkingOutputStreamAdapter(ref <SMTPConnection> conn)
+ : m_connection(conn), m_bufferSize(0), m_chunkCount(0)
+{
+}
+
+
+void SMTPChunkingOutputStreamAdapter::sendChunk
+ (const value_type* const data, const size_type count, const bool last)
+{
+ if (count == 0 && !last)
+ {
+ // Nothing to send
+ return;
+ }
+
+ // Send this chunk
+ m_connection->sendRequest(SMTPCommand::BDAT(count, last));
+ m_connection->getSocket()->sendRaw(data, count);
+
+ ++m_chunkCount;
+
+ // If PIPELINING is not supported, read one response for this BDAT command
+ if (!m_connection->hasExtension("PIPELINING"))
+ {
+ ref <SMTPResponse> resp = m_connection->readResponse();
+
+ if (resp->getCode() != 250)
+ {
+ m_connection->getTransport()->disconnect();
+ throw exceptions::command_error("BDAT", resp->getText());
+ }
+ }
+ // If PIPELINING is supported, read one response for each chunk (ie. number
+ // of BDAT commands issued) after the last chunk has been sent
+ else if (last)
+ {
+ bool invalidReply = false;
+ ref <SMTPResponse> resp;
+
+ for (unsigned int i = 0 ; i < m_chunkCount ; ++i)
+ {
+ resp = m_connection->readResponse();
+
+ if (resp->getCode() != 250)
+ invalidReply = true;
+ }
+
+ if (invalidReply)
+ {
+ m_connection->getTransport()->disconnect();
+ throw exceptions::command_error("BDAT", resp->getText());
+ }
+ }
+}
+
+
+void SMTPChunkingOutputStreamAdapter::write
+ (const value_type* const data, const size_type count)
+{
+ const value_type* curData = data;
+ size_type curCount = count;
+
+ while (curCount != 0)
+ {
+ // Fill the buffer
+ const size_type remaining = sizeof(m_buffer) - m_bufferSize;
+ const size_type bytesToCopy = std::min(remaining, curCount);
+
+ std::copy(data, data + bytesToCopy, m_buffer);
+
+ m_bufferSize += bytesToCopy;
+ curData += bytesToCopy;
+ curCount -= bytesToCopy;
+
+ // If the buffer is full, send this chunk
+ if (m_bufferSize >= sizeof(m_buffer))
+ {
+ sendChunk(m_buffer, m_bufferSize, /* last */ false);
+ m_bufferSize = 0;
+ }
+ }
+}
+
+
+void SMTPChunkingOutputStreamAdapter::flush()
+{
+ sendChunk(m_buffer, m_bufferSize, /* last */ true);
+ m_bufferSize = 0;
+}
+
+
+utility::stream::size_type SMTPChunkingOutputStreamAdapter::getBlockSize()
+{
+ return sizeof(m_buffer);
+}
+
+
+} // smtp
+} // net
+} // vmime
+
+
+#endif // VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_SMTP
diff --git a/src/net/smtp/SMTPCommand.cpp b/src/net/smtp/SMTPCommand.cpp
index d9f5c286..9813c4f5 100644
--- a/src/net/smtp/SMTPCommand.cpp
+++ b/src/net/smtp/SMTPCommand.cpp
@@ -150,6 +150,20 @@ ref <SMTPCommand> SMTPCommand::DATA()
// static
+ref <SMTPCommand> SMTPCommand::BDAT(const unsigned long chunkSize, const bool last)
+{
+ std::ostringstream cmd;
+ cmd.imbue(std::locale::classic());
+ cmd << "BDAT " << chunkSize;
+
+ if (last)
+ cmd << " LAST";
+
+ return createCommand(cmd.str());
+}
+
+
+// static
ref <SMTPCommand> SMTPCommand::NOOP()
{
return createCommand("NOOP");
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index 9e00ac4d..fb951bad 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -31,6 +31,7 @@
#include "vmime/net/smtp/SMTPResponse.hpp"
#include "vmime/net/smtp/SMTPCommand.hpp"
#include "vmime/net/smtp/SMTPCommandSet.hpp"
+#include "vmime/net/smtp/SMTPChunkingOutputStreamAdapter.hpp"
#include "vmime/exception.hpp"
#include "vmime/mailboxList.hpp"
@@ -155,14 +156,10 @@ void SMTPTransport::noop()
}
-void SMTPTransport::send
+void SMTPTransport::sendEnvelope
(const mailbox& expeditor, const mailboxList& recipients,
- utility::inputStream& is, const utility::stream::size_type size,
- utility::progressListener* progress, const mailbox& sender)
+ const mailbox& sender, bool sendDATACommand)
{
- if (!isConnected())
- throw exceptions::not_connected();
-
// If no recipient/expeditor was found, throw an exception
if (recipients.isEmpty())
throw exceptions::no_recipient();
@@ -199,7 +196,8 @@ void SMTPTransport::send
}
// Prepare sending of message data
- commands->addCommand(SMTPCommand::DATA());
+ if (sendDATACommand)
+ commands->addCommand(SMTPCommand::DATA());
// Read response for "RSET" command
if (needReset)
@@ -238,13 +236,29 @@ void SMTPTransport::send
}
// Read response for "DATA" command
- commands->writeToSocket(m_connection->getSocket());
-
- if ((resp = m_connection->readResponse())->getCode() != 354)
+ if (sendDATACommand)
{
- disconnect();
- throw exceptions::command_error(commands->getLastCommandSent()->getText(), resp->getText());
+ commands->writeToSocket(m_connection->getSocket());
+
+ if ((resp = m_connection->readResponse())->getCode() != 354)
+ {
+ disconnect();
+ throw exceptions::command_error(commands->getLastCommandSent()->getText(), resp->getText());
+ }
}
+}
+
+
+void SMTPTransport::send
+ (const mailbox& expeditor, const mailboxList& recipients,
+ utility::inputStream& is, const utility::stream::size_type size,
+ utility::progressListener* progress, const mailbox& sender)
+{
+ if (!isConnected())
+ throw exceptions::not_connected();
+
+ // Send message envelope
+ sendEnvelope(expeditor, recipients, sender, /* sendDATACommand */ true);
// Send the message data
// Stream copy with "\n." to "\n.." transformation
@@ -258,6 +272,8 @@ void SMTPTransport::send
// Send end-of-data delimiter
m_connection->getSocket()->sendRaw("\r\n.\r\n", 5);
+ ref <SMTPResponse> resp;
+
if ((resp = m_connection->readResponse())->getCode() != 250)
{
disconnect();
@@ -270,21 +286,39 @@ void SMTPTransport::send
(ref <vmime::message> msg, const mailbox& expeditor, const mailboxList& recipients,
utility::progressListener* progress, const mailbox& sender)
{
+ if (!isConnected())
+ throw exceptions::not_connected();
+
// Generate the message with Internationalized Email support,
// if this is supported by the SMTP server
- std::ostringstream oss;
- utility::outputStreamAdapter ossAdapter(oss);
-
generationContext ctx(generationContext::getDefaultContext());
ctx.setInternationalizedEmailSupport(m_connection->hasExtension("SMTPUTF8"));
- msg->generate(ctx, ossAdapter);
+ // If CHUNKING is not supported, generate the message to a temporary
+ // buffer then use the send() method which takes an inputStream
+ if (!m_connection->hasExtension("CHUNKING"))
+ {
+ std::ostringstream oss;
+ utility::outputStreamAdapter ossAdapter(oss);
+
+ msg->generate(ctx, ossAdapter);
+
+ const string& str(oss.str());
+
+ utility::inputStreamStringAdapter isAdapter(str);
+
+ send(expeditor, recipients, isAdapter, str.length(), progress, sender);
+ }
+
+ // Send message envelope
+ sendEnvelope(expeditor, recipients, sender, /* sendDATACommand */ false);
- const string& str(oss.str());
+ // Send the message by chunks
+ SMTPChunkingOutputStreamAdapter chunkStream(m_connection);
- utility::inputStreamStringAdapter isAdapter(str);
+ msg->generate(ctx, chunkStream);
- send(expeditor, recipients, isAdapter, str.length(), progress, sender);
+ chunkStream.flush();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-17 05:37:22 +0000