Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-03-08 15:36:49 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-05-01 17:14:55 (GMT) |
| commit | 794fec2873e69ec047974416768b32b69754dad1 (patch) | |
| tree | a3cc8cb221e9ee7ad5c40a9de0ccc03e5f9d9562 /Swiften/FileTransfer/SConscript | |
| parent | d7bc3a37f4bb261c8520a8ddedcda2369f97361c (diff) | |
| download | swift-794fec2873e69ec047974416768b32b69754dad1.zip swift-794fec2873e69ec047974416768b32b69754dad1.tar.bz2 | |
Add resource management for S5B server and port forwardings
This patchs adds management of the SOCKS5 bytestream server and port
forwarding setup to Swiften. The first file-transfer, regardless of
incoming or outgoing transfer, will start and initialize the S5B server
and if configured try to set up port forwarding. The last file-transfer
to finish will will close the server and remove the port forwarding.
Test-Information:
Tested with upcoming ConcurrentFileTransferTest.cpp and running multiple
S5B file-transfers in parallel.
Change-Id: Idd09d3d0ef9498fc9435b0aee81f2b1061783342
Diffstat (limited to 'Swiften/FileTransfer/SConscript')
| -rw-r--r-- | Swiften/FileTransfer/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/FileTransfer/SConscript b/Swiften/FileTransfer/SConscript index 88cfc00..ff162ad 100644 --- a/Swiften/FileTransfer/SConscript +++ b/Swiften/FileTransfer/SConscript @@ -26,7 +26,6 @@ sources = [ "IBBSendTransportSession.cpp", "IBBReceiveTransportSession.cpp", "SOCKS5BytestreamClientSession.cpp", - "SOCKS5BytestreamServerInitializeRequest.cpp", "SOCKS5BytestreamServerManager.cpp", "SOCKS5BytestreamServer.cpp", "SOCKS5BytestreamServerSession.cpp", @@ -38,6 +37,8 @@ sources = [ "FileTransferManager.cpp", "FileTransferManagerImpl.cpp", "IncrementalBytestreamHashCalculator.cpp", + "SOCKS5BytestreamServerResourceUser.cpp", + "SOCKS5BytestreamServerPortForwardingUser.cpp", ] swiften_env.Append(SWIFTEN_OBJECTS = swiften_env.SwiftenObject(sources)) |