X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-netty-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fnettyutil%2Fhandler%2Fssh%2Fclient%2FSshClient.java;h=271b781b99aa2ebd1154c8a4786180a574d0594b;hp=3520fe029d41cbf01218cb6c8df9dd4500522be3;hb=c0664e68c1408f269a5782f2dba4b1e9044164f6;hpb=ace21ede4027c481d820b40da25b74c73642e5da diff --git a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClient.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClient.java index 3520fe029d..271b781b99 100644 --- a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClient.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/SshClient.java @@ -10,18 +10,16 @@ package org.opendaylight.controller.netconf.nettyutil.handler.ssh.client; import ch.ethz.ssh2.Connection; import ch.ethz.ssh2.Session; -import ch.ethz.ssh2.channel.Channel; -import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; -import org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket.VirtualSocket; - import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; +import org.opendaylight.controller.netconf.nettyutil.handler.ssh.virtualsocket.VirtualSocket; /** * Wrapper class around GANYMED SSH java library. */ -public class SshClient { +class SshClient { private final VirtualSocket socket; private final Map openSessions = new HashMap<>(); private final AuthenticationHandler authenticationHandler; @@ -51,15 +49,10 @@ public class SshClient { authenticationHandler.authenticate(connection); } - public void closeSession(SshSession session) { - if (session.getState() == Channel.STATE_OPEN || session.getState() == Channel.STATE_OPENING) { - session.close(); - } - } public void close() { for (SshSession session : openSessions.values()){ - closeSession(session); + session.close(); } openSessions.clear(); @@ -68,4 +61,11 @@ public class SshClient { connection.close(); } } + + @Override + public String toString() { + return "SshClient{" + + "socket=" + socket + + '}'; + } }