ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-04-16 21:41:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve EOF handling for half-close. Patch from Catalin Patulea

Browse Source 
Fixes the situation
$ ./dbclient root@1.2.3.4 'cat; echo foo'
^D
<no output>
This commit is contained in:
Matt Johnston 2013-09-21 00:17:22 +08:00
parent e7917c16c9
commit dffb33cecf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common-channel.c
View File

@ -307,7 +307,9 @@ static void check_close(struct Channel *channel) {
return; return;
} }
if (channel->recv_eof && !write_pending(channel)) { if ((channel->recv_eof && !write_pending(channel))
/* have a server "session" and child has exited */
|| (channel->type->check_close && close_allowed)) {
close_chan_fd(channel, channel->writefd, SHUT_WR); close_chan_fd(channel, channel->writefd, SHUT_WR);
} }
@ -336,6 +338,7 @@ 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->readfd == FD_CLOSED if (channel->readfd == FD_CLOSED
&& channel->writefd == FD_CLOSED
&& (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED) && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED)
&& !channel->sent_close && !channel->sent_close
&& close_allowed && close_allowed