Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-09-28 19:26:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-28 19:26:48 (GMT) |
| commit | 6cea7fdfea93e54543c6757909a8fae7348754fc (patch) | |
| tree | ebdb062bcf8c707e45a6151e9069a08461c3a373 | |
| parent | 585ec5609fd437a222bdfa6eb243cc4ce8e45391 (diff) | |
| download | swift-contrib-6cea7fdfea93e54543c6757909a8fae7348754fc.zip swift-contrib-6cea7fdfea93e54543c6757909a8fae7348754fc.tar.bz2 | |
Added getRecipient() to IncomingJingleFileTransfer.
| -rw-r--r-- | Swiften/FileTransfer/IncomingFileTransfer.h | 2 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IncomingJingleFileTransfer.cpp | 4 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IncomingJingleFileTransfer.h | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Swiften/FileTransfer/IncomingFileTransfer.h b/Swiften/FileTransfer/IncomingFileTransfer.h index a6cf05e..5b53d54 100644 --- a/Swiften/FileTransfer/IncomingFileTransfer.h +++ b/Swiften/FileTransfer/IncomingFileTransfer.h @@ -15,12 +15,14 @@ namespace Swift { class IncomingFileTransfer : public FileTransfer { public: typedef boost::shared_ptr<IncomingFileTransfer> ref; virtual ~IncomingFileTransfer(); virtual void accept(WriteBytestream::ref) = 0; + virtual const JID& getSender() const = 0; + virtual const JID& getRecipient() const = 0; }; } diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp index 0481a47..ab6b5e5 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp @@ -118,18 +118,22 @@ void IncomingJingleFileTransfer::accept(WriteBytestream::ref stream) { else { assert(false); } } const JID& IncomingJingleFileTransfer::getSender() const { return session->getInitiator(); } +const JID& IncomingJingleFileTransfer::getRecipient() const { + return ourJID; +} + void IncomingJingleFileTransfer::cancel() { session->sendTerminate(JinglePayload::Reason::Cancel); if (activeTransport) activeTransport->stop(); if (serverSession) serverSession->stop(); if (clientSession) clientSession->stop(); onStateChange(FileTransfer::State(FileTransfer::State::Canceled)); } diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h index 9e77de7..4ae0bfb 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h @@ -42,31 +42,32 @@ namespace Swift { Initial, CreatingInitialTransports, NegotiatingTransport, Transferring, WaitingForFallbackOrTerminate, Terminated }; IncomingJingleFileTransfer( - const JID& ourJID, + const JID& recipient, JingleSession::ref, JingleContentPayload::ref content, RemoteJingleTransportCandidateSelectorFactory*, LocalJingleTransportCandidateGeneratorFactory*, IQRouter* router, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, TimerFactory*); ~IncomingJingleFileTransfer(); virtual void accept(WriteBytestream::ref); virtual const JID& getSender() const; + virtual const JID& getRecipient() const; void cancel(); private: void handleSessionTerminateReceived(boost::optional<JinglePayload::Reason>); void handleSessionInfoReceived(JinglePayload::ref); void handleTransportReplaceReceived(const JingleContentID&, JingleTransportPayload::ref); void handleTransportInfoReceived(const JingleContentID&, JingleTransportPayload::ref); void handleLocalTransportCandidatesGenerated(JingleTransportPayload::ref candidates); void handleRemoteTransportCandidateSelectFinished(JingleTransportPayload::ref candidate); |