From fa5b42ae0ab3d4d622d007cd7fd1e62fe02b557b Mon Sep 17 00:00:00 2001 From: Zeng Junjie Date: Fri, 3 Sep 2021 19:27:51 +0800 Subject: [PATCH 1/2] adding timeout --- muon-app/src/main/java/muon/app/ssh/SshClient2.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/muon-app/src/main/java/muon/app/ssh/SshClient2.java b/muon-app/src/main/java/muon/app/ssh/SshClient2.java index 6b30c3fb..2b84a0cc 100644 --- a/muon-app/src/main/java/muon/app/ssh/SshClient2.java +++ b/muon-app/src/main/java/muon/app/ssh/SshClient2.java @@ -51,6 +51,8 @@ public class SshClient2 implements Closeable { private SshClient2 previousHop; private ServerSocket ss; + //30000 ms + private static final int CONNECTION_TIMEOUT = 30000; /** * O * @@ -177,7 +179,7 @@ private void connect(Deque hopStack) throws IOException, OperationCanc this.inputBlocker.blockInput(); try { sshj = new SSHClient(); - + sshj.setTimeout(CONNECTION_TIMEOUT); if (hopStack.isEmpty()) { this.setupProxyAndSocketFactory(); this.sshj.addHostKeyVerifier(App.HOST_KEY_VERIFIER); From d37ed7b3faaca491fab6f326f1ee88acb724b741 Mon Sep 17 00:00:00 2001 From: Zeng Junjie Date: Fri, 3 Sep 2021 19:40:19 +0800 Subject: [PATCH 2/2] adding connection timeout --- muon-app/src/main/java/muon/app/ssh/SshClient2.java | 1 + 1 file changed, 1 insertion(+) diff --git a/muon-app/src/main/java/muon/app/ssh/SshClient2.java b/muon-app/src/main/java/muon/app/ssh/SshClient2.java index 2b84a0cc..5d946916 100644 --- a/muon-app/src/main/java/muon/app/ssh/SshClient2.java +++ b/muon-app/src/main/java/muon/app/ssh/SshClient2.java @@ -179,6 +179,7 @@ private void connect(Deque hopStack) throws IOException, OperationCanc this.inputBlocker.blockInput(); try { sshj = new SSHClient(); + sshj.setConnectTimeout(CONNECTION_TIMEOUT); sshj.setTimeout(CONNECTION_TIMEOUT); if (hopStack.isEmpty()) { this.setupProxyAndSocketFactory();