diff options
author | Tobias Markmann <tm@ayena.de> | 2016-06-29 15:06:30 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2016-06-29 15:11:43 (GMT) |
commit | 82dd5a11131b3bd3641316b87aa279d806c970b0 (patch) | |
tree | 659ac3d0e1520a1fbe1265500e0b73c8597a00a8 /Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp | |
parent | 09c22ea2ff3ff40b9b298475d47809b4bd373216 (diff) | |
download | swift-82dd5a11131b3bd3641316b87aa279d806c970b0.zip swift-82dd5a11131b3bd3641316b87aa279d806c970b0.tar.bz2 |
Fail file-transfer if proxy session of candidate does not exist
Test-Information:
Tested with a buggy XMPP client that calculates S5B DSTADDR
in a non-standard way. Previously this lead to Swift crashing
on an assert. Now Swift just indicates file-transfer failure
to the other party.
Change-Id: I4ed47f9647a1851f2a5101657bcd569c106d638f
Diffstat (limited to 'Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp')
-rw-r--r-- | Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp index 6a738ee..367676b 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp +++ b/Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.cpp @@ -102,6 +102,7 @@ std::shared_ptr<SOCKS5BytestreamClientSession> SOCKS5BytestreamProxiesManager::g i->second->stop(); } } + SWIFT_LOG_ASSERT(activeSession, warning) << "No active session with matching ID found." << std::endl; proxySessions_.erase(sessionID); |