mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 15:15:25 +02:00
Code Issues Wiki Activity

cancel the ssh connection correctly (terminate the SshConnection thread)

Browse source
This commit is contained in:
Michael Scharf 2006-12-08 05:25:42 +00:00
parent b9dfb44a5c
commit f19c85aded
2 changed files with 49 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnection.java
View file

@ -30,6 +30,7 @@ import org.eclipse.tm.terminal.Logger;
import org.eclipse.tm.terminal.TerminalState;
import org.eclipse.ui.preferences.ScopedPreferenceStore;
import com.jcraft.jsch.Channel;
import com.jcraft.jsch.ChannelShell;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
@ -40,9 +41,12 @@ import com.jcraft.jsch.Session;
import com.jcraft.jsch.UserInfo;
class SshConnection extends Thread {
private static int fgNo;
private final ITerminalControl fControl;
private final SshConnector fConn;
private Channel fChannel;
protected SshConnection(SshConnector conn,ITerminalControl control) {
super("SshConnection-"+fgNo++);
fControl = control;
fConn = conn;
fControl.setState(TerminalState.CONNECTING);
@ -211,7 +215,7 @@ class SshConnection extends Thread {
session.setProxy(proxy);
}
session.setTimeout(0); //never time out once connected
session.setPassword(password);
////Giving a connectionId could be the index into a local
////Store where passwords are stored
@ -238,6 +242,8 @@ class SshConnection extends Thread {
fControl.setState(TerminalState.CONNECTED);
// read data until the connection gets terminated
readDataForever(fConn.getInputStream());
// when reading is done, we set the state to closed
fControl.setState(TerminalState.CLOSED);
} catch (JSchException e) {
connectFailed(e.getMessage(),e.getMessage());
} catch (IOException e) {
@ -246,7 +252,21 @@ class SshConnection extends Thread {
}
}
synchronized void setChannel(Channel channel) {
fChannel = channel;
}
/**
* disconnect the ssh session
*/
void disconnect() {
interrupt();
synchronized (this) {
if(fChannel!=null) {
fChannel.disconnect();
fChannel=null;
}
}
}
/**
* Read the data from the ssh connection and display it in the terminal.
* @param in
@ -255,11 +275,26 @@ class SshConnection extends Thread {
private void readDataForever(InputStream in) throws IOException {
// read the data
byte bytes[]=new byte[32*1024];
int n;
while((n=in.read(bytes))!=-1) {
fControl.writeToTerminal(new String(bytes,0,n));
// read until the thread gets interrupted....
while(!isInterrupted()) {
int n;
// We have to poll. There seems no better way to cancel
// the read from ssh....
while(in.available()==0) {
try {
sleep(1);
} catch (InterruptedException e) {
// propagate the interrupt
interrupt();
return;
}
}
// read some bytes
if((n=in.read(bytes))==-1)
return;
// we assume we get ASCII UTF8 bytes
fControl.writeToTerminal(new String(bytes,0,n,"UTF8"));
}
fControl.setState(TerminalState.CLOSED);
}
protected static Display getStandardDisplay() {
@ -321,8 +356,8 @@ class SshConnection extends Thread {
String _password = promptSecret(message);
if (_password!=null) {
fPassword=_password;
return true;
}
return true;
}
return false;
}
public void showMessage(final String message) {
@ -339,7 +374,7 @@ class SshConnection extends Thread {
if (prompt.length == 0) {
// No need to prompt, just return an empty String array
return new String[0];
}
}
try{
if (fAttemptCount == 0 && fPassword != null && prompt.length == 1 && prompt[0].trim().equalsIgnoreCase("password:")) { //$NON-NLS-1$
// Return the provided password the first time but always prompt on subsequent tries

10
terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/terminal/ssh/SshConnector.java
View file

@ -30,7 +30,7 @@ public class SshConnector implements ITerminalConnector {
private ITerminalControl fControl;
private JSch fJsch;
private ChannelShell fChannel;
private SshConnection fConnection;
private final SshSettings fSettings;
public SshConnector() {
this(new SshSettings());
@ -53,12 +53,12 @@ public class SshConnector implements ITerminalConnector {
public void connect(ITerminalControl control) {
Logger.log("entered."); //$NON-NLS-1$
fControl=control;
SshConnection worker = new SshConnection(this,control);
worker.start();
fConnection = new SshConnection(this,control);
fConnection.start();
}
public void disconnect() {
synchronized public void disconnect() {
Logger.log("entered."); //$NON-NLS-1$
fConnection.disconnect();
if (getInputStream() != null) {
try {
getInputStream().close();