summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/sys/posix
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2010-01-23 00:16:34 +0000
committerStephen D. Huston <shuston@apache.org>2010-01-23 00:16:34 +0000
commit772484f911db95bbc0c1ac599ed72b2ee143bec0 (patch)
treee5865eb45a96f31ae84027f44caed4baccda9f21 /cpp/src/qpid/sys/posix
parent1b489dec1ea09cde9365602befb49eb958a62cdd (diff)
downloadqpid-python-772484f911db95bbc0c1ac599ed72b2ee143bec0.tar.gz
Add SSL support for Windows client and broker per QPID-1403. Adds new AsynchIO::BufferBase::squish() method that does what used to be done by in-place memmove() calls so it can be reused easily.
SSL support for Windows is in: - Client: qpid/client/windows/SslConnector.cpp qpid/client/TCPConnector.{h cpp} rearranged a bit to make pieces available to SslConnector - Broker: qpid/broker/windows/SslProtocolFactory.cpp - Common: qpid/sys/windows/SslAsynchIO contains all the Schannel stuff to negotiate a session, encrypt, and decrypt data. The SslAsynchIO acts as a shim between the layer above and the "regular" AsynchIO that actually handles read/write and completions. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@902318 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/posix')
-rw-r--r--cpp/src/qpid/sys/posix/AsynchIO.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/cpp/src/qpid/sys/posix/AsynchIO.cpp
index d4c64dd814..fd7886145b 100644
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/cpp/src/qpid/sys/posix/AsynchIO.cpp
@@ -319,10 +319,7 @@ void AsynchIO::queueReadBuffer(BufferBase* buff) {
void AsynchIO::unread(BufferBase* buff) {
assert(buff);
- if (buff->dataStart != 0) {
- memmove(buff->bytes, buff->bytes+buff->dataStart, buff->dataCount);
- buff->dataStart = 0;
- }
+ buff->squish();
bool queueWasEmpty = bufferQueue.empty();
bufferQueue.push_front(buff);