[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [trojita] src/Streams: net: Add information about the used proxy to the network debug messages
From:       Jan_Kundrát <jkt () flaska ! net>
Date:       2014-02-28 18:41:04
Message-ID: E1WJSMq-0007ZB-0U () scm ! kde ! org
[Download RAW message or body]

Git commit 4d8874994bad63b24142fb1b988c9deca8832120 by Jan Kundrát.
Committed on 28/02/2014 at 14:45.
Pushed by jkt into branch 'master'.

net: Add information about the used proxy to the network debug messages

Previously, there was no indication that a proxy was actually being used.

REVIEW: 116482

M  +24   -3    src/Streams/IODeviceSocket.cpp

http://commits.kde.org/trojita/4d8874994bad63b24142fb1b988c9deca8832120

diff --git a/src/Streams/IODeviceSocket.cpp b/src/Streams/IODeviceSocket.cpp
index 72f4018..19fe8d3 100644
--- a/src/Streams/IODeviceSocket.cpp
+++ b/src/Streams/IODeviceSocket.cpp
@@ -268,13 +268,34 @@ void SslTlsSocket::handleStateChanged()
 
     QAbstractSocket *sock = qobject_cast<QAbstractSocket *>(d);
     Q_ASSERT(sock);
+    QString proxyMsg;
+    switch (sock->proxy().type()) {
+    case QNetworkProxy::NoProxy:
+        break;
+    case QNetworkProxy::DefaultProxy:
+    case QNetworkProxy::HttpCachingProxy:
+    case QNetworkProxy::FtpCachingProxy:
+        // these proxy types are not supposed to be supported
+        Q_ASSERT(false);
+        break;
+    case QNetworkProxy::Socks5Proxy:
+        proxyMsg = tr(" (via SOCKS5 proxy %1)").arg(sock->proxy().hostName());
+        break;
+    case QNetworkProxy::HttpProxy:
+        proxyMsg = tr(" (via HTTP proxy %1)").arg(sock->proxy().hostName());
+        break;
+    }
     switch (sock->state()) {
     case QAbstractSocket::HostLookupState:
-        emit stateChanged(Imap::CONN_STATE_HOST_LOOKUP, tr("Looking up \
%1...").arg(host)); +        emit stateChanged(Imap::CONN_STATE_HOST_LOOKUP, \
tr("Looking up %1%2...").arg(host, +                              \
sock->proxy().capabilities().testFlag(QNetworkProxy::HostNameLookupCapability) ? +    \
proxyMsg : QString()));  break;
     case QAbstractSocket::ConnectingState:
-        emit stateChanged(Imap::CONN_STATE_CONNECTING, tr("Connecting to \
                %1:%2%3...").arg(
-                              host, QString::number(port), startEncrypted ? tr(" \
(SSL)") : QString())); +        emit stateChanged(Imap::CONN_STATE_CONNECTING, \
tr("Connecting to %1:%2%3%4...").arg( +                              host, \
QString::number(port), startEncrypted ? tr(" (SSL)") : QString(), +                   \
sock->proxy().capabilities().testFlag(QNetworkProxy::TunnelingCapability) ? +         \
proxyMsg : QString()));  break;
     case QAbstractSocket::BoundState:
     case QAbstractSocket::ListeningState:


[prev in list] [next in list] [prev in thread] [next in thread]