Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/arduino/Arduino.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartino Facchin <m.facchin@arduino.cc>2019-07-30 11:25:59 +0300
committerMartino Facchin <m.facchin@arduino.cc>2019-07-30 11:26:03 +0300
commitadabb08390d59a8913ff9785958f44b91d1ab236 (patch)
treed7b2a86ad717a75a4c51de42ba177de240a440c4
parentf0722843f6701b2441a0832997cb0470c19d4c2c (diff)
NetworkUpload. use ipAddress to start jSch session
Fixes #9097
-rw-r--r--arduino-core/src/cc/arduino/packages/ssh/SSHConfigFileSetup.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/arduino-core/src/cc/arduino/packages/ssh/SSHConfigFileSetup.java b/arduino-core/src/cc/arduino/packages/ssh/SSHConfigFileSetup.java
index 2f2e53cff..5d4cb66cf 100644
--- a/arduino-core/src/cc/arduino/packages/ssh/SSHConfigFileSetup.java
+++ b/arduino-core/src/cc/arduino/packages/ssh/SSHConfigFileSetup.java
@@ -46,7 +46,6 @@ public class SSHConfigFileSetup implements SSHClientSetupChainRing {
@Override
public Session setup(BoardPort port, JSch jSch) throws JSchException, IOException {
String ipAddress = port.getAddress();
- String hostname = port.getBoardName().contains(".local") ? port.getBoardName() : port.getBoardName() + ".local";
File sshFolder = new File(System.getProperty("user.home"), ".ssh");
File sshConfig = new File(sshFolder, "config");
@@ -62,7 +61,7 @@ public class SSHConfigFileSetup implements SSHClientSetupChainRing {
jSch.setConfigRepository(new OpenSSHConfigWrapper(configRepository, ipAddress));
- return jSch.getSession(hostname);
+ return jSch.getSession(ipAddress);
}
public static class OpenSSHConfigWrapper implements ConfigRepository {