Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-11 15:40:09 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-11 09:36:03 (GMT) |
| commit | f176050a50fb846bbad3fb49d6b2f7a2c81e3589 (patch) | |
| tree | bd93b8b540cb3818cc0d47d44b9dd8751dd17dd5 /Swiften/FileTransfer/OutgoingJingleFileTransfer.h | |
| parent | 71e34ffa7144441bc5a7fce15728f506daffc756 (diff) | |
| download | swift-f176050a50fb846bbad3fb49d6b2f7a2c81e3589.zip swift-f176050a50fb846bbad3fb49d6b2f7a2c81e3589.tar.bz2 | |
Wait for responder to terminate the the file transfer session after data
verification.
Test-Information:
Tested with FileTransferTest (coming with future commit) and inspected
the logs.
Change-Id: Idd2739e15ab944e8486065cb2a3bc559ce9053d1
Diffstat (limited to 'Swiften/FileTransfer/OutgoingJingleFileTransfer.h')
| -rw-r--r-- | Swiften/FileTransfer/OutgoingJingleFileTransfer.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h index f022b9f..52960d5 100644 --- a/Swiften/FileTransfer/OutgoingJingleFileTransfer.h +++ b/Swiften/FileTransfer/OutgoingJingleFileTransfer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2013-2014 Isode Limited. + * Copyright (c) 2013-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -22,6 +22,7 @@ #include <Swiften/FileTransfer/OutgoingFileTransfer.h> #include <Swiften/FileTransfer/JingleFileTransfer.h> #include <Swiften/FileTransfer/FileTransferOptions.h> +#include <Swiften/Network/Timer.h> namespace Swift { class ReadBytestream; @@ -31,6 +32,7 @@ namespace Swift { class FileTransferTransporter; class FileTransferTransporterFactory; class TransportSession; + class TimerFactory; class SWIFTEN_API OutgoingJingleFileTransfer : public OutgoingFileTransfer, public JingleFileTransfer { public: @@ -39,6 +41,7 @@ namespace Swift { boost::shared_ptr<JingleSession>, boost::shared_ptr<ReadBytestream>, FileTransferTransporterFactory*, + TimerFactory*, IDGenerator*, const JingleFileTransferFileInfo&, const FileTransferOptions&, @@ -59,6 +62,7 @@ namespace Swift { WaitingForCandidateAcknowledge, FallbackRequested, Transferring, + WaitForTermination, Finished }; @@ -90,6 +94,8 @@ namespace Swift { virtual boost::shared_ptr<TransportSession> createLocalCandidateSession() SWIFTEN_OVERRIDE; virtual boost::shared_ptr<TransportSession> createRemoteCandidateSession() SWIFTEN_OVERRIDE; + void handleWaitForRemoteTerminationTimeout(); + void stopAll(); void setState(State state); void setFinishedState(FileTransfer::State::Type, const boost::optional<FileTransferError>& error); @@ -106,6 +112,8 @@ namespace Swift { State state; bool candidateAcknowledged; + Timer::ref waitForRemoteTermination; + boost::bsignals::connection processedBytesConnection; boost::bsignals::connection transferFinishedConnection; }; |