aboutsummaryrefslogtreecommitdiff
path: root/src/client/QXmppTransferManager.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2012-09-17 20:25:24 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2012-09-17 20:25:24 +0200
commit33056a200b1cf044201fd37d694197eea315bb26 (patch)
tree3816d4b6cbbdcd6eb995ff132b01b3366cd82b55 /src/client/QXmppTransferManager.cpp
parentd0bb9c4848d8a82fd477981bf4c9adfb0a314890 (diff)
downloadqxmpp-33056a200b1cf044201fd37d694197eea315bb26.tar.gz
Allow StreamHost::host to contain a host name
Diffstat (limited to 'src/client/QXmppTransferManager.cpp')
-rw-r--r--src/client/QXmppTransferManager.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index 986db974..a6784813 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -478,9 +478,9 @@ void QXmppTransferIncomingJob::connectToNextHost()
// try next host
m_candidateHost = m_streamCandidates.takeFirst();
- info(QString("Connecting to streamhost: %1 (%2:%3)").arg(
+ info(QString("Connecting to streamhost: %1 (%2 %3)").arg(
m_candidateHost.jid(),
- m_candidateHost.host().toString(),
+ m_candidateHost.host(),
QString::number(m_candidateHost.port())));
const QString hostName = streamHash(d->sid,
@@ -540,9 +540,9 @@ void QXmppTransferIncomingJob::_q_candidateReady()
if (!m_candidateClient)
return;
- info(QString("Connected to streamhost: %1 (%2:%3)").arg(
+ info(QString("Connected to streamhost: %1 (%2 %3)").arg(
m_candidateHost.jid(),
- m_candidateHost.host().toString(),
+ m_candidateHost.host(),
QString::number(m_candidateHost.port())));
setState(QXmppTransferJob::TransferState);
@@ -573,9 +573,9 @@ void QXmppTransferIncomingJob::_q_candidateDisconnected()
if (!m_candidateClient)
return;
- warning(QString("Failed to connect to streamhost: %1 (%2:%3)").arg(
+ warning(QString("Failed to connect to streamhost: %1 (%2 %3)").arg(
m_candidateHost.jid(),
- m_candidateHost.host().toString(),
+ m_candidateHost.host(),
QString::number(m_candidateHost.port())));
m_candidateClient->deleteLater();
@@ -621,9 +621,9 @@ void QXmppTransferOutgoingJob::connectToProxy()
bool check;
Q_UNUSED(check);
- info(QString("Connecting to proxy: %1 (%2:%3)").arg(
+ info(QString("Connecting to proxy: %1 (%2 %3)").arg(
d->socksProxy.jid(),
- d->socksProxy.host().toString(),
+ d->socksProxy.host(),
QString::number(d->socksProxy.port())));
const QString hostName = streamHash(d->sid,
@@ -1446,7 +1446,7 @@ void QXmppTransferManager::socksServerSendOffer(QXmppTransferJob *job)
continue;
QXmppByteStreamIq::StreamHost streamHost;
- streamHost.setHost(entry.ip());
+ streamHost.setHost(entry.ip().toString());
streamHost.setPort(d->socksServer->serverPort());
streamHost.setJid(ownJid);
streamHosts.append(streamHost);