summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-09-26 20:29:46 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-09-26 20:29:46 (GMT)
commitdf957dbaaa42330ff888e42fe6f2d31c01d8129d (patch)
tree9fc32248674af5a678fccf09567833d89b4a77db /Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
parent4c59af568ab9913dd4a7f0df2ebb35f5ec480bbf (diff)
downloadswift-df957dbaaa42330ff888e42fe6f2d31c01d8129d.zip
swift-df957dbaaa42330ff888e42fe6f2d31c01d8129d.tar.bz2
Compile on Windows
Diffstat (limited to 'Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp')
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
index f90b73b..a18b998 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
@@ -16,6 +16,7 @@
#include <Swiften/StringCodecs/Hexify.h>
#include <Swiften/FileTransfer/BytestreamException.h>
#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Base/ByteArray.h>
namespace Swift {
@@ -89,7 +90,7 @@ void SOCKS5BytestreamClientSession::process() {
// complete domainname and port not available yet
break;
}
- bndAddress = createByteArray(&(unprocessedData.data()[5]), unprocessedData[4]);
+ bndAddress = createByteArray(&vecptr(unprocessedData)[5], unprocessedData[4]);
if (unprocessedData[unprocessedData[4] + 5] != 0 && bndAddress == createByteArray(destination)) {
// we expect a 0 as port
// disconnect and fail
@@ -215,7 +216,7 @@ void SOCKS5BytestreamClientSession::handleDataRead(const SafeByteArray& data) {
process();
}
else {
- writeBytestream->write(createByteArray(data.data(), data.size()));
+ writeBytestream->write(createByteArray(vecptr(data), data.size()));
onBytesReceived(data.size());
}
}