Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2016-03-16 15:45:11 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-03-16 15:57:40 (GMT) |
| commit | f693c8e0fa9c6a051cdf6260f131db3d9355b49f (patch) | |
| tree | 10ca50f0c3494566e005f9c202f7d3b6c6d036f9 | |
| parent | 8b9891afc85d114ff1e9c9a0291a4aaee8baeb09 (diff) | |
| download | stroke-f693c8e0fa9c6a051cdf6260f131db3d9355b49f.zip stroke-f693c8e0fa9c6a051cdf6260f131db3d9355b49f.tar.bz2 | |
Support early IBB use in Jingle File Transfer
As per swiften patch of the same name
(75703db2de5bbfb6622286600362016edb42dfb0).
Previously Jingle File Transfer in Stroke only used IBB transport as
fallback mechanism. With this patch Stroke will use IBB transport
candidates directly in the first session-initate/session-accept
message if the other party only supports IBB.
Test-information: Unit tests all pass.
Change-Id: Ice73a6028f10c63490bdb775a0a407fad48f587a
6 files changed, 78 insertions, 27 deletions
diff --git a/src/com/isode/stroke/filetransfer/DummyFileTransferTransporterFactory.java b/src/com/isode/stroke/filetransfer/DummyFileTransferTransporterFactory.java index 10b630d..1904944 100644 --- a/src/com/isode/stroke/filetransfer/DummyFileTransferTransporterFactory.java +++ b/src/com/isode/stroke/filetransfer/DummyFileTransferTransporterFactory.java @@ -1,3 +1,3 @@ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2016 Isode Limited. * All rights reserved. @@ -53,3 +53,3 @@ class DummyFileTransferTransporter extends FileTransferTransporter { IQRouter iqRouter, - final FileTransferOptions option) { + final FileTransferOptions ftOptions) { initiator_ = initiator; @@ -60,2 +60,3 @@ class DummyFileTransferTransporter extends FileTransferTransporter { iqRouter_ = iqRouter; + ftOptions_ = new FileTransferOptions(ftOptions); } @@ -68,2 +69,8 @@ class DummyFileTransferTransporter extends FileTransferTransporter { Vector<JingleS5BTransportPayload.Candidate> candidates = new Vector<JingleS5BTransportPayload.Candidate>(); + if (ftOptions_.isDirectAllowed()) { + JingleS5BTransportPayload.Candidate candidate = new JingleS5BTransportPayload.Candidate(); + candidate.cid = "123"; + candidate.priority = 1235; + candidates.add(candidate); + } onLocalCandidatesGenerated.emit(s5bSessionID_, candidates, getSOCKS5DstAddr()); @@ -149,2 +156,3 @@ class DummyFileTransferTransporter extends FileTransferTransporter { private IQRouter iqRouter_; + private final FileTransferOptions ftOptions_; }; diff --git a/src/com/isode/stroke/filetransfer/IncomingFileTransferManager.java b/src/com/isode/stroke/filetransfer/IncomingFileTransferManager.java index 7166d67..06ed3ab 100644 --- a/src/com/isode/stroke/filetransfer/IncomingFileTransferManager.java +++ b/src/com/isode/stroke/filetransfer/IncomingFileTransferManager.java @@ -1,3 +1,3 @@ /* - * Copyright (c) 2010-2015 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. @@ -17,2 +17,3 @@ import com.isode.stroke.jingle.JingleSessionManager; import com.isode.stroke.jingle.JingleSession; +import com.isode.stroke.elements.JingleIBBTransportPayload; import com.isode.stroke.elements.JinglePayload; @@ -26,2 +27,3 @@ import com.isode.stroke.queries.IQRouter; import com.isode.stroke.jid.JID; + import java.util.logging.Logger; @@ -57,3 +59,4 @@ public class IncomingFileTransferManager implements IncomingJingleSessionHandler JingleContentPayload content = Jingle.getContentWithDescription(contents, new JingleFileTransferDescription()); - if (content.getTransport(new JingleS5BTransportPayload()) != null) { + if ( (content.getTransport(new JingleS5BTransportPayload()) != null) + || (content.getTransport(new JingleIBBTransportPayload()) != null) ) { JingleFileTransferDescription description = content.getDescription(new JingleFileTransferDescription()); diff --git a/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java b/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java index 1c67014..f6aa01f 100644 --- a/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java +++ b/src/com/isode/stroke/filetransfer/IncomingJingleFileTransfer.java @@ -173,4 +173,5 @@ public class IncomingJingleFileTransfer extends JingleFileTransfer implements In - if (initialContent.getTransport(new JingleS5BTransportPayload()) != null) { - JingleS5BTransportPayload s5bTransport = initialContent.getTransport(new JingleS5BTransportPayload()); + JingleS5BTransportPayload s5bTransport = initialContent.getTransport(new JingleS5BTransportPayload()); + JingleIBBTransportPayload ibbTransport = initialContent.getTransport(new JingleIBBTransportPayload()); + if (s5bTransport != null) { logger_.fine("Got S5B transport as initial payload.\n"); @@ -181,4 +182,3 @@ public class IncomingJingleFileTransfer extends JingleFileTransfer implements In } - else if(initialContent.getTransport(new JingleIBBTransportPayload()) != null) { - JingleIBBTransportPayload ibbTransport = initialContent.getTransport(new JingleIBBTransportPayload()); + else if(ibbTransport != null && options.isInBandAllowed()) { logger_.fine("Got IBB transport as initial payload.\n"); @@ -191,4 +191,5 @@ public class IncomingJingleFileTransfer extends JingleFileTransfer implements In else { - // Can't happen, because the transfer would have been rejected automatically - assert(false); + // This might happen on incoming transfer which only list transport methods we are not allowed to use due to file-transfer options. + session.sendTerminate(JinglePayload.Reason.Type.UnsupportedTransports); + setFinishedState(FileTransfer.State.Type.Failed, new FileTransferError(FileTransferError.Type.PeerError)); } diff --git a/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java b/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java index aa38022..e2117b6 100644 --- a/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java +++ b/src/com/isode/stroke/filetransfer/OutgoingJingleFileTransfer.java @@ -181,6 +181,15 @@ public class OutgoingJingleFileTransfer extends JingleFileTransfer implements Ou } - - setTransporter(transporterFactory.createInitiatorTransporter(getInitiator(), getResponder(), options)); - setInternalState(State.GeneratingInitialLocalCandidates); - transporter.startGeneratingLocalCandidates(); + + if (!options.isInBandAllowed() && !options.isDirectAllowed() + && !options.isAssistedAllowed() && !options.isProxiedAllowed()) { + // Started outgoing file transfer while not supporting transport methods. + setFinishedState(FileTransfer.State.Type.Failed, + new FileTransferError(FileTransferError.Type.UnknownError)); + } + else { + setTransporter(transporterFactory.createInitiatorTransporter(getInitiator(), getResponder(), options)); + setInternalState(State.GeneratingInitialLocalCandidates); + transporter.startGeneratingLocalCandidates(); + } + } @@ -219,2 +228,9 @@ public class OutgoingJingleFileTransfer extends JingleFileTransfer implements Ou } + else if (transportPayload instanceof JingleIBBTransportPayload) { + JingleIBBTransportPayload ibbPayload = (JingleIBBTransportPayload) transportPayload; + int blockSize = ibbPayload.getBlockSize() != null ? + ibbPayload.getBlockSize().intValue() : DEFAULT_BLOCK_SIZE; + startTransferring(transporter.createIBBSendSession(ibbPayload.getSessionID(), + blockSize, stream)); + } else { @@ -312,10 +328,21 @@ public class OutgoingJingleFileTransfer extends JingleFileTransfer implements Ou - JingleS5BTransportPayload transport = new JingleS5BTransportPayload(); - transport.setSessionID(s5bSessionID); - transport.setMode(JingleS5BTransportPayload.Mode.TCPMode); - transport.setDstAddr(dstAddr); - for(JingleS5BTransportPayload.Candidate candidate : candidates) { - transport.addCandidate(candidate); - logger_.fine("\t" + "S5B candidate: " + candidate.hostPort.toString() + "\n"); - } + JingleTransportPayload transport = null; + if (candidates.isEmpty()) { + logger_.fine("no S5B candidate generated. Send IBB transport candidate.\n"); + JingleIBBTransportPayload ibbTransport = new JingleIBBTransportPayload(); + ibbTransport.setBlockSize(DEFAULT_BLOCK_SIZE); + ibbTransport.setSessionID(idGenerator.generateID()); + transport = ibbTransport; + } + else { + JingleS5BTransportPayload s5bTransport = new JingleS5BTransportPayload(); + s5bTransport.setSessionID(s5bSessionID); + s5bTransport.setMode(JingleS5BTransportPayload.Mode.TCPMode); + s5bTransport.setDstAddr(dstAddr); + for (JingleS5BTransportPayload.Candidate candidate : candidates) { + s5bTransport.addCandidate(candidate); + logger_.fine("\tS5B candidate: "+candidate.hostPort +"\n"); + } + transport = s5bTransport; + } setInternalState(State.WaitingForAccept); diff --git a/src/com/isode/stroke/filetransfer/SOCKS5BytestreamServerManager.java b/src/com/isode/stroke/filetransfer/SOCKS5BytestreamServerManager.java index 590ee60..0d1f0a9 100644 --- a/src/com/isode/stroke/filetransfer/SOCKS5BytestreamServerManager.java +++ b/src/com/isode/stroke/filetransfer/SOCKS5BytestreamServerManager.java @@ -128,2 +128,6 @@ public class SOCKS5BytestreamServerManager { } + if (unforwardPortRequest != null) { + unforwardPortRequest.stop(); + unforwardPortRequest = null; + } if (server != null) { diff --git a/test/com/isode/stroke/filetransfer/OutgoingJingleFileTransferTest.java b/test/com/isode/stroke/filetransfer/OutgoingJingleFileTransferTest.java index 4532efb..f8b76b8 100644 --- a/test/com/isode/stroke/filetransfer/OutgoingJingleFileTransferTest.java +++ b/test/com/isode/stroke/filetransfer/OutgoingJingleFileTransferTest.java @@ -100,5 +100,8 @@ public class OutgoingJingleFileTransferTest { - JingleS5BTransportPayload transport = null; - if (call.payload instanceof JingleS5BTransportPayload) { - transport = (JingleS5BTransportPayload) call.payload; + JingleIBBTransportPayload transport = null; + if (call.payload instanceof JingleIBBTransportPayload) { + transport = (JingleIBBTransportPayload) call.payload; + } + else { + System.out.println(call.payload.getClass().getName()); } @@ -109,3 +112,4 @@ public class OutgoingJingleFileTransferTest { public void test_FallbackToIBBAfterFailingS5b() { - OutgoingJingleFileTransfer transfer = createTestling(); + OutgoingJingleFileTransfer transfer = + createTestling(new FileTransferOptions().withAssistedAllowed(true).withDirectAllowed(true).withProxiedAllowed(true)); transfer.start(); @@ -114,2 +118,3 @@ public class OutgoingJingleFileTransferTest { + assertTrue(call.payload instanceof JingleS5BTransportPayload); fakeJingleSession.handleSessionAcceptReceived(call.id, call.description, call.payload); @@ -213,2 +218,6 @@ public class OutgoingJingleFileTransferTest { private OutgoingJingleFileTransfer createTestling() { + return createTestling(new FileTransferOptions().withAssistedAllowed(false).withDirectAllowed(false).withProxiedAllowed(false)); + } + + private OutgoingJingleFileTransfer createTestling(FileTransferOptions options) { JID to = new JID("test@foo.com/bla"); @@ -219,3 +228,2 @@ public class OutgoingJingleFileTransferTest { fileInfo.setSize(1024 * 1024); - FileTransferOptions options = (new FileTransferOptions()).withAssistedAllowed(false).withDirectAllowed(false).withProxiedAllowed(false); return new OutgoingJingleFileTransfer(to, fakeJingleSession, stream, |