X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=third-party%2Fganymed%2Fsrc%2Fmain%2Fjava%2Fch%2Fethz%2Fssh2%2FConnection.java;fp=third-party%2Fganymed%2Fsrc%2Fmain%2Fjava%2Fch%2Fethz%2Fssh2%2FConnection.java;h=786f81ce06caf392bfdd264035c2bace7fb07d6e;hp=bf742c5f5f4f5d33f4f7879d3d103e621dee9c44;hb=eb42b5484e585dfe55e85eeedc762b51181de43f;hpb=3965334ee0661e87ca6c9e12d91bd77d493e9c6d diff --git a/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java b/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java index bf742c5f5f..786f81ce06 100644 --- a/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java +++ b/third-party/ganymed/src/main/java/ch/ethz/ssh2/Connection.java @@ -60,6 +60,14 @@ public class Connection private SecureRandom generator; + private Socket precreatedSocket; + + public Connection(Socket socket) { + this.precreatedSocket = socket; + this.hostname = socket.getInetAddress().getHostName(); + this.port = socket.getPort(); + } + /** * Unless you know what you are doing, you will never need this. * @@ -745,8 +753,14 @@ public class Connection try { - tm.clientInit(hostname, port, softwareversion, cryptoWishList, verifier, dhgexpara, connectTimeout, - getOrCreateSecureRND(), proxyData); + + if (precreatedSocket != null) { + tm.clientInit(precreatedSocket, softwareversion, cryptoWishList, verifier, dhgexpara, + getOrCreateSecureRND()); + } else { + tm.clientInit(hostname, port, softwareversion, cryptoWishList, verifier, dhgexpara, connectTimeout, + getOrCreateSecureRND(), proxyData); + } } catch (SocketTimeoutException se) {