You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2016/02/26 17:47:01 UTC
[4/4] mina-sshd git commit: Moved (unused)
AbstractServerSession#serviceAccept logic to
AbstractServerSession#handleServiceAccept
Moved (unused) AbstractServerSession#serviceAccept logic to AbstractServerSession#handleServiceAccept
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/fa205ccb
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/fa205ccb
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/fa205ccb
Branch: refs/heads/master
Commit: fa205ccbcfd8c98817b682d45424646cd1cd5dfc
Parents: 7f52ea8
Author: Lyor Goldstein <ly...@gmail.com>
Authored: Fri Feb 26 18:47:45 2016 +0200
Committer: Lyor Goldstein <ly...@gmail.com>
Committed: Fri Feb 26 18:47:45 2016 +0200
----------------------------------------------------------------------
.../org/apache/sshd/server/session/AbstractServerSession.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/fa205ccb/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java
index 2c2bd01..1fa6996 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java
@@ -186,9 +186,10 @@ public abstract class AbstractServerSession extends AbstractSession implements S
}
@Override
- protected void serviceAccept() throws IOException {
+ protected void handleServiceAccept(String serviceName, Buffer buffer) throws Exception {
+ super.handleServiceAccept(serviceName, buffer);
// TODO: can services be initiated by the server-side ?
- disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR, "Unsupported packet: SSH_MSG_SERVICE_ACCEPT");
+ disconnect(SshConstants.SSH2_DISCONNECT_PROTOCOL_ERROR, "Unsupported packet: SSH_MSG_SERVICE_ACCEPT for " + serviceName);
}
@Override
@@ -302,7 +303,7 @@ public abstract class AbstractServerSession extends AbstractSession implements S
clientVersion = doReadIdentification(buffer, true);
if (GenericUtils.isEmpty(clientVersion)) {
buffer.rpos(rpos); // restore original buffer position
- return false;
+ return false; // more data required
}
if (log.isDebugEnabled()) {