mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

[205986] attempt SSL before non-SSL for daemon connect

Browse source
This commit is contained in:
David McKnight 2007-10-10 21:13:45 +00:00
parent a68cbfca7a
commit cf617adc39
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/client/ClientConnection.java
View file

@ -12,7 +12,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * David McKnight (IBM) - [205986] daemon handshake needs a timeout
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.core.client; package org.eclipse.dstore.core.client;
@ -739,6 +739,7 @@ public class ClientConnection
SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort); SSLSocket lSocket = (SSLSocket) factory.createSocket(_host, daemonPort);
_launchSocket = lSocket; _launchSocket = lSocket;
lSocket.setSoTimeout(10000);
lSocket.startHandshake(); lSocket.startHandshake();
SSLSession session = lSocket.getSession(); SSLSession session = lSocket.getSession();

12
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
View file

@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes
* David McKnight (IBM) - [202822] need to enable spiriting on the server side * David McKnight (IBM) - [202822] need to enable spiriting on the server side
* David McKnight (IBM) - [199565] taking out synchronize for internalConnect * David McKnight (IBM) - [199565] taking out synchronize for internalConnect
* David McKnight (IBM) - [205986] attempt SSL before non-SSL for daemon connect
********************************************************************************/ ********************************************************************************/
package org.eclipse.rse.connectorservice.dstore; package org.eclipse.rse.connectorservice.dstore;
@ -625,15 +626,16 @@ public class DStoreConnectorService extends StandardConnectorService implements
daemonPort = Integer.parseInt(daemonPortStr); daemonPort = Integer.parseInt(daemonPortStr);
}*/ }*/
// DKM - changed to use protected member so that others can override // 205986] FIRST TRY SSL, THEN NON-SECURE!
//launchStatus = clientConnection.launchServer(info.getUserid(), info.getPassword(), daemonPort); boolean usedSSL = true;
boolean usedSSL = false; setSSLProperties(true);
launchStatus = launchServer(clientConnection, info, daemonPort, monitor); launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
if (!launchStatus.isConnected() && !clientConnection.isKnownStatus(launchStatus.getMessage())) if (!launchStatus.isConnected() && !clientConnection.isKnownStatus(launchStatus.getMessage()))
{ {
if (setSSLProperties(true)) if (setSSLProperties(false))
{ {
usedSSL = true; usedSSL = false;
launchStatus = launchServer(clientConnection, info, daemonPort, monitor); launchStatus = launchServer(clientConnection, info, daemonPort, monitor);
} }
} }