Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2016-02-05 12:29:28 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-02-09 11:26:11 (GMT) |
| commit | 2a0022faeefc38a987e3ad55087f3dd45c35a9fb (patch) | |
| tree | d6f05250c48038b06fd0d1266b5d212bfff55c42 /src/com/isode/stroke/filetransfer/SOCKS5BytestreamClientSession.java | |
| parent | 14ce99a513cf4ac8ff4a2305bd5917285dc14106 (diff) | |
| download | stroke-2a0022faeefc38a987e3ad55087f3dd45c35a9fb.zip stroke-2a0022faeefc38a987e3ad55087f3dd45c35a9fb.tar.bz2 | |
Finish porting S5BTransportSession
Finish porting S5BTransportSession to Stroke (previously a lot of it had been commented out). To
do so had to introduce a heirachy to the SOCKS5BytestreamSession classes (which were being used as
type parameters for the Transport Session) and refactor some of the onByteSent signals to insure
they were all of the same type (Integer).
Also update PortingProgress.txt to update to give status of some of the porting files.
Test-information:
Ran unit tests they all still pass.
Change-Id: I4295b3a8829c208e65f5a46d19c35090f8c55865
Diffstat (limited to 'src/com/isode/stroke/filetransfer/SOCKS5BytestreamClientSession.java')
| -rw-r--r-- | src/com/isode/stroke/filetransfer/SOCKS5BytestreamClientSession.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/isode/stroke/filetransfer/SOCKS5BytestreamClientSession.java b/src/com/isode/stroke/filetransfer/SOCKS5BytestreamClientSession.java index 0144bcb..3e51b5f 100644 --- a/src/com/isode/stroke/filetransfer/SOCKS5BytestreamClientSession.java +++ b/src/com/isode/stroke/filetransfer/SOCKS5BytestreamClientSession.java @@ -4,7 +4,7 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015 - 2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -33,7 +33,7 @@ import java.util.logging.Logger; * A session which has been connected to a SOCKS5 server (requester). * */ -public class SOCKS5BytestreamClientSession { +public class SOCKS5BytestreamClientSession extends SOCKS5AbstractBytestreamSession { public enum State { Initial(0), @@ -145,10 +145,6 @@ public class SOCKS5BytestreamClientSession { public Signal1<Boolean /*error*/> onSessionReady = new Signal1<Boolean>(); - public Signal1<FileTransferError> onFinished = new Signal1<FileTransferError>(); - public Signal1<Integer> onBytesSent = new Signal1<Integer>(); - //public boost::signal<void (size_t)> onBytesReceived; - private void process() { logger_.fine("unprocessedData.size(): " + unprocessedData.getSize() + "\n"); ByteArray bndAddress = new ByteArray(); |