Updated Branches: refs/heads/master c0957cc2b -> 154b3cffb
[SSHD-275] Allow access to the Version information from the ClientSession Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/154b3cff Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/154b3cff Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/154b3cff Branch: refs/heads/master Commit: 154b3cffbfa0544c6d3aa9c0946596524f0aed41 Parents: c0957cc Author: Guillaume Nodet <[email protected]> Authored: Thu Jan 23 17:19:51 2014 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Thu Jan 23 17:19:51 2014 +0100 ---------------------------------------------------------------------- .../sshd/client/session/ClientSessionImpl.java | 4 ---- .../main/java/org/apache/sshd/common/Session.java | 14 ++++++++++++++ .../sshd/common/session/AbstractSession.java | 17 +++++++++++++++++ .../apache/sshd/server/session/ServerSession.java | 8 -------- 4 files changed, 31 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/154b3cff/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java index 73fbb18..2d4e68c 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java @@ -94,10 +94,6 @@ public class ClientSessionImpl extends AbstractSession implements ClientSession return (ClientFactoryManager) factoryManager; } - public KeyExchange getKex() { - return kex; - } - /** * return true if/when ready for auth; false if never ready. * @return server is ready and waiting for auth http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/154b3cff/sshd-core/src/main/java/org/apache/sshd/common/Session.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/Session.java b/sshd-core/src/main/java/org/apache/sshd/common/Session.java index d28b29e..52be5cf 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/Session.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/Session.java @@ -67,6 +67,20 @@ public interface Session { String getUsername(); /** + * Retrieve the client version for this session. + * + * @return the client version. + */ + String getClientVersion(); + + /** + * Retrieve the server version for this session. + * + * @return the server version. + */ + String getServerVersion(); + + /** * Retrieve the FactoryManager that has created this session * * @return the factory manager, can not be <tt>null</tt>. http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/154b3cff/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java index 4148e65..cb01ca1 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/session/AbstractSession.java @@ -210,6 +210,23 @@ public abstract class AbstractSession implements Session { } } + public String getServerVersion() { + return serverVersion; + } + + public String getClientVersion() { + return clientVersion; + } + + public KeyExchange getKex() { + return kex; + } + + public byte [] getSessionId() { + return sessionId; + } + + /** * Retrieve the mina session * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/154b3cff/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java index 89958f5..40b9cc5 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSession.java @@ -100,14 +100,6 @@ public class ServerSession extends AbstractSession { return negociated[index]; } - public KeyExchange getKex() { - return kex; - } - - public byte [] getSessionId() { - return sessionId; - } - public ServerFactoryManager getServerFactoryManager() { return (ServerFactoryManager) factoryManager; }
