ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-12 07:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make sure that the test for queued packets to write occurs after

Browse Source 
those packets might have been enqueued by set_connect_fds()
This commit is contained in:
Matt Johnston 2015-09-29 21:53:27 +08:00
parent 90f4da29d7
commit 8ccbd216c6
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common-session.c
View File

@ -159,6 +159,16 @@ void session_loop(void(*loophandler)()) {
FD_ZERO(&readfd); FD_ZERO(&readfd);
dropbear_assert(ses.payload == NULL); dropbear_assert(ses.payload == NULL);
/* We get woken up when signal handlers write to this pipe.
SIGCHLD in svr-chansession is the only one currently. */
FD_SET(ses.signal_pipe[0], &readfd);
/* set up for channels which can be read/written */
setchannelfds(&readfd, &writefd, writequeue_has_space);
/* Pending connections to test */
set_connect_fds(&writefd);
/* We delay reading from the input socket during initial setup until /* We delay reading from the input socket during initial setup until
after we have written out our initial KEXINIT packet (empty writequeue). after we have written out our initial KEXINIT packet (empty writequeue).
This means our initial packet can be in-flight while we're doing a blocking This means our initial packet can be in-flight while we're doing a blocking
@ -170,19 +180,12 @@ void session_loop(void(*loophandler)()) {
&& writequeue_has_space) { && writequeue_has_space) {
FD_SET(ses.sock_in, &readfd); FD_SET(ses.sock_in, &readfd);
} }
/* Ordering is important, this test must occur after any other function
might have queued packets (such as connection handlers) */
if (ses.sock_out != -1 && !isempty(&ses.writequeue)) { if (ses.sock_out != -1 && !isempty(&ses.writequeue)) {
FD_SET(ses.sock_out, &writefd); FD_SET(ses.sock_out, &writefd);
} }
/* We get woken up when signal handlers write to this pipe.
SIGCHLD in svr-chansession is the only one currently. */
FD_SET(ses.signal_pipe[0], &readfd);
/* set up for channels which can be read/written */
setchannelfds(&readfd, &writefd, writequeue_has_space);
/* Pending connections to test */
set_connect_fds(&writefd);
val = select(ses.maxfd+1, &readfd, &writefd, NULL, &timeout); val = select(ses.maxfd+1, &readfd, &writefd, NULL, &timeout);