diff options
| author | Christian Kandeler <[email protected]> | 2012-10-01 14:51:27 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2012-10-04 12:07:48 +0200 |
| commit | 6c1b0fc80d8de71b5423120965aeb0961e9bacc1 (patch) | |
| tree | d17096c3b82d6045a93b0e486d4fa525a8acf853 /src/libs/ssh/sshconnection.cpp | |
| parent | 41b963934d3540dd6827bea6993ac0f9f9fc60bf (diff) | |
SSH: Add infrastructure for passing additional connection options.
So far, the only option is whether to use the default proxy or not. More
will follow.
Change-Id: Icd1ec407a0269cc8e7577901853d3873fd03015c
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/libs/ssh/sshconnection.cpp')
| -rw-r--r-- | src/libs/ssh/sshconnection.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/ssh/sshconnection.cpp b/src/libs/ssh/sshconnection.cpp index e03304ca2ee..7040f721603 100644 --- a/src/libs/ssh/sshconnection.cpp +++ b/src/libs/ssh/sshconnection.cpp @@ -82,7 +82,7 @@ namespace { SshConnectionParameters::SshConnectionParameters() : - timeout(0), authenticationType(AuthenticationByKey), port(0), proxyType(NoProxy) + timeout(0), authenticationType(AuthenticationByKey), port(0), options(SshIgnoreDefaultProxy) { } @@ -226,8 +226,8 @@ SshConnectionPrivate::SshConnectionPrivate(SshConnection *conn, m_conn(conn) { setupPacketHandlers(); - m_socket->setProxy(m_connParams.proxyType == SshConnectionParameters::DefaultProxy - ? QNetworkProxy::DefaultProxy : QNetworkProxy::NoProxy); + m_socket->setProxy((m_connParams.options & SshIgnoreDefaultProxy) + ? QNetworkProxy::NoProxy : QNetworkProxy::DefaultProxy); m_timeoutTimer.setSingleShot(true); m_timeoutTimer.setInterval(m_connParams.timeout * 1000); m_keepAliveTimer.setSingleShot(true); |