diff options
| author | Kenny Root <kenny@the-b.org> | 2008-11-19 18:00:41 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2008-11-19 18:00:41 +0000 |
| commit | 6311f174c4b5b2d15f7af4b046afa027b3b049f7 (patch) | |
| tree | 2b763610b05e02bffa4d23a56b35d26a02048332 /src | |
| parent | a73651642f63303908eac848eb898b9e425ee88b (diff) | |
| download | connectbot-6311f174c4b5b2d15f7af4b046afa027b3b049f7.tar.gz connectbot-6311f174c4b5b2d15f7af4b046afa027b3b049f7.tar.bz2 connectbot-6311f174c4b5b2d15f7af4b046afa027b3b049f7.zip | |
Catch when our remote shell is killed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/connectbot/service/TerminalBridge.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/connectbot/service/TerminalBridge.java b/src/org/connectbot/service/TerminalBridge.java index 5f63b30..d91a21f 100644 --- a/src/org/connectbot/service/TerminalBridge.java +++ b/src/org/connectbot/service/TerminalBridge.java @@ -557,12 +557,13 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal int conditions = ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA | ChannelCondition.CLOSED - | ChannelCondition.EXIT_STATUS; + | ChannelCondition.EXIT_STATUS + | ChannelCondition.EXIT_SIGNAL; int newConditions = 0; while((newConditions & ChannelCondition.CLOSED) == 0) { try { newConditions = session.waitForCondition(conditions, 0); - if ((newConditions & ChannelCondition.STDOUT_DATA) == ChannelCondition.STDOUT_DATA) { + if ((newConditions & ChannelCondition.STDOUT_DATA) != 0) { n = stdout.read(b); if (n > 0) { ((vt320)buffer).putString(new String(b, 0, n, ENCODING)); @@ -570,13 +571,13 @@ public class TerminalBridge implements VDUDisplay, OnKeyListener, InteractiveCal } } - if ((newConditions & ChannelCondition.STDERR_DATA) == ChannelCondition.STDERR_DATA) { + if ((newConditions & ChannelCondition.STDERR_DATA) != 0) { n = stderr.read(b); // TODO I don't know.. do we want this? We were ignoring it before Log.d(TAG, String.format("Read data from stderr: %s", new String(b, 0, n, ENCODING))); } - if ((newConditions & ChannelCondition.EXIT_STATUS) == ChannelCondition.EXIT_STATUS) { + if ((newConditions & (ChannelCondition.EXIT_STATUS | ChannelCondition.EXIT_SIGNAL)) != 0) { // The other side closed our channel, so let's disconnect. // TODO review whether any tunnel is in use currently. dispatchDisconnect(); |