My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions

Issue 2003 attachment: patch (2.5 KB)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67

---
.../java/com/google/gerrit/sshd/SshDaemon.java | 15 +++++++++------
pom.xml | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index c43de60..ddc2d8f 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -81,6 +81,8 @@ import org.apache.sshd.server.kex.DHG1;
import org.apache.sshd.server.kex.DHG14;
import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.server.session.SessionFactory;
+import org.apache.sshd.server.ForwardingAcceptorFactory;
+import org.apache.sshd.server.session.DefaultForwardingAcceptorFactory;
import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -154,12 +156,6 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {

long idleTimeoutSeconds = ConfigUtil.getTimeUnit(cfg, "sshd", null,
"idleTimeout", 0, SECONDS);
- if (idleTimeoutSeconds == 0) {
- // Since Apache SSHD does not allow to turn off closing idle connections,
- // we fake it by using the highest timeout allowed by Apache SSHD, which
- // amounts to ~24 days.
- idleTimeoutSeconds = MILLISECONDS.toSeconds(Integer.MAX_VALUE);
- }
getProperties().put(
IDLE_TIMEOUT,
String.valueOf(SECONDS.toMillis(idleTimeoutSeconds)));
@@ -182,6 +178,7 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
initChannels();
initForwardingFilter();
initFileSystemFactory();
+ initForwardingAcceptorFactory();
initSubsystems();
initCompression();
initUserAuth(userAuth);
@@ -518,4 +515,10 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
}
});
}
+
+ private void initForwardingAcceptorFactory() {
+ ForwardingAcceptorFactory faf = new DefaultForwardingAcceptorFactory();
+ setTcpipForwardNioSocketAcceptorFactory(faf);
+ setX11ForwardNioSocketAcceptorFactory(faf);
+ }
}
diff --git a/pom.xml b/pom.xml
index df0096d..ac7e92d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -582,7 +582,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.6.0</version>
+ <version>0.7.0</version>
</dependency>

<dependency>
--
1.7.1

Powered by Google Project Hosting