ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 02:46:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't return until the shell has quit. This will ensure that an exit status

Browse Source 
is always returned.

--HG--
extra : convert_revision : 32fc88053016994100eb0ef17f75592881c90d97
This commit is contained in:
Matt Johnston 2008-02-21 14:46:15 +00:00
parent e277059339
commit 6c9d2abc75
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common-channel.c
View File

@ -261,6 +261,7 @@ static unsigned int write_pending(struct Channel * channel) {
/* EOF/close handling */ /* EOF/close handling */
static void check_close(struct Channel *channel) { static void check_close(struct Channel *channel) {
int close_allowed = 0;
TRACE(("check_close: writefd %d, readfd %d, errfd %d, sent_close %d, recv_close %d", TRACE(("check_close: writefd %d, readfd %d, errfd %d, sent_close %d, recv_close %d",
channel->writefd, channel->readfd, channel->writefd, channel->readfd,
@ -275,7 +276,16 @@ static void check_close(struct Channel *channel) {
channel->flushing = 1; channel->flushing = 1;
} }
if (channel->recv_close && !write_pending(channel)) { // if a type-specific check_close is defined we will only exit
// once that has been triggered. this is only used for a server "session"
// channel, to ensure that the shell has exited (and the exit status
// retrieved) before we close things up.
if (!channel->type->check_close
|| channel->type->check_close(channel)) {
close_allowed = 1;
}
if (channel->recv_close && !write_pending(channel) && close_allowed) {
if (!channel->sent_close) { if (!channel->sent_close) {
TRACE(("Sending MSG_CHANNEL_CLOSE in response to same.")) TRACE(("Sending MSG_CHANNEL_CLOSE in response to same."))
send_msg_channel_close(channel); send_msg_channel_close(channel);
@ -312,9 +322,10 @@ static void check_close(struct Channel *channel) {
} }
/* And if we can't receive any more data from them either, close up */ /* And if we can't receive any more data from them either, close up */
if (!channel->sent_close if (channel->readfd == FD_CLOSED
&& channel->readfd == FD_CLOSED
&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED) && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
&& !channel->sent_close
&& close_allowed
&& !write_pending(channel)) { && !write_pending(channel)) {
TRACE(("sending close, readfd is closed")) TRACE(("sending close, readfd is closed"))
send_msg_channel_close(channel); send_msg_channel_close(channel);