You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2013/02/25 08:50:03 UTC
[4/7] git commit: [SSHD-208] TCPIP forwarders should send CLOSE not
EOF
[SSHD-208] TCPIP forwarders should send CLOSE not EOF
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/99674917
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/99674917
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/99674917
Branch: refs/heads/master
Commit: 99674917538c61cd462df32caabd7046afa92491
Parents: 866dca2
Author: gnodet <gn...@apache.org>
Authored: Tue Feb 19 15:23:54 2013 +0100
Committer: gnodet <gn...@apache.org>
Committed: Tue Feb 19 15:23:54 2013 +0100
----------------------------------------------------------------------
.../sshd/common/forward/TcpipClientChannel.java | 6 ------
.../sshd/common/forward/TcpipServerChannel.java | 10 +---------
2 files changed, 1 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/99674917/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
index 2f76813..f1efd8e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java
@@ -108,10 +108,4 @@ public class TcpipClientChannel extends AbstractClientChannel {
localWindow.consumeAndCheck(len);
serverSession.write(buf);
}
-
- @Override
- public void handleEof() throws IOException {
- super.handleEof();
- serverSession.close(false);
- }
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/99674917/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
index 2f6ef21..283ad17 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipServerChannel.java
@@ -129,9 +129,7 @@ public class TcpipServerChannel extends AbstractServerChannel {
@Override
public void sessionClosed(IoSession session) throws Exception {
- if (!closing) {
- sendEof();
- }
+ close(false);
}
};
connector.setHandler(handler);
@@ -187,12 +185,6 @@ public class TcpipServerChannel extends AbstractServerChannel {
});
}
- @Override
- public void handleEof() throws IOException {
- super.handleEof();
- close(false);
- }
-
protected void doWriteData(byte[] data, int off, int len) throws IOException {
IoBuffer buf = IoBuffer.allocate(len);
buf.put(data, off, len);