Swiftdiff options
Diffstat (limited to 'Swiften/FileTransfer/IBBReceiveSession.cpp')
| -rw-r--r-- | Swiften/FileTransfer/IBBReceiveSession.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Swiften/FileTransfer/IBBReceiveSession.cpp b/Swiften/FileTransfer/IBBReceiveSession.cpp index 1a2bb3a..8cfd95d 100644 --- a/Swiften/FileTransfer/IBBReceiveSession.cpp +++ b/Swiften/FileTransfer/IBBReceiveSession.cpp @@ -28,5 +28,5 @@ class IBBReceiveSession::IBBResponder : public SetResponder<IBB> { if (ibb->getAction() == IBB::Data) { if (sequenceNumber == ibb->getSequenceNumber()) { - session->onDataReceived(ibb->getData()); + session->bytestream->write(ibb->getData()); receivedSize += ibb->getData().size(); sequenceNumber++; @@ -34,5 +34,5 @@ class IBBReceiveSession::IBBResponder : public SetResponder<IBB> { if (receivedSize >= session->size) { if (receivedSize > session->size) { - std::cerr << "Warning: Received more data than expected" << std::endl; + SWIFT_LOG(warning) << "Received more data than expected"; } session->finish(boost::optional<FileTransferError>()); @@ -40,5 +40,5 @@ class IBBReceiveSession::IBBResponder : public SetResponder<IBB> { } else { - SWIFT_LOG(warning) << "Received data out of order" << std::endl; + SWIFT_LOG(warning) << "Received data out of order"; sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel); session->finish(FileTransferError(FileTransferError::ClosedError)); @@ -46,9 +46,9 @@ class IBBReceiveSession::IBBResponder : public SetResponder<IBB> { } else if (ibb->getAction() == IBB::Open) { - SWIFT_LOG(debug) << "IBB open received" << std::endl; + SWIFT_LOG(debug) << "IBB open received"; sendResponse(from, id, IBB::ref()); } else if (ibb->getAction() == IBB::Close) { - SWIFT_LOG(debug) << "IBB close received" << std::endl; + SWIFT_LOG(debug) << "IBB close received"; sendResponse(from, id, IBB::ref()); session->finish(FileTransferError(FileTransferError::ClosedError)); @@ -56,5 +56,5 @@ class IBBReceiveSession::IBBResponder : public SetResponder<IBB> { return true; } - SWIFT_LOG(debug) << "wrong from/sessionID: " << from << " == " << session->from << " / " <<ibb->getStreamID() << " == " << session->id << std::endl; + SWIFT_LOG(debug) << "wrong from/sessionID: " << from << " == " << session->from << " / " <<ibb->getStreamID() << " == " << session->id; return false; } @@ -63,5 +63,5 @@ class IBBReceiveSession::IBBResponder : public SetResponder<IBB> { IBBReceiveSession* session; int sequenceNumber; - size_t receivedSize; + unsigned long long receivedSize; }; @@ -71,5 +71,6 @@ IBBReceiveSession::IBBReceiveSession( const JID& from, const JID& to, - size_t size, + unsigned long long size, + boost::shared_ptr<WriteBytestream> bytestream, IQRouter* router) : id(id), @@ -77,4 +78,5 @@ IBBReceiveSession::IBBReceiveSession( to(to), size(size), + bytestream(bytestream), router(router), active(false) { @@ -86,5 +88,5 @@ IBBReceiveSession::IBBReceiveSession( IBBReceiveSession::~IBBReceiveSession() { if (active) { - SWIFT_LOG(warning) << "Session still active" << std::endl; + SWIFT_LOG(warning) << "Session still active"; } delete responder; @@ -92,5 +94,5 @@ IBBReceiveSession::~IBBReceiveSession() { void IBBReceiveSession::start() { - SWIFT_LOG(debug) << "receive session started" << std::endl; + SWIFT_LOG(debug) << "receive session started"; active = true; responder->start(); @@ -98,5 +100,5 @@ void IBBReceiveSession::start() { void IBBReceiveSession::stop() { - SWIFT_LOG(debug) << "receive session stopped" << std::endl; + SWIFT_LOG(debug) << "receive session stopped"; responder->stop(); if (active) { |