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

Fix ses.channel_signal_pending race

Browse Source
This commit is contained in:
Matt Johnston 2015-11-27 21:26:43 +08:00
parent 33b2fbb5ef
commit ee353847be
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common-channel.c
View File

@ -255,8 +255,6 @@ void channelio(fd_set *readfds, fd_set *writefds) {
} }
} }
ses.channel_signal_pending = 0;
#ifdef USING_LISTENERS #ifdef USING_LISTENERS
handle_listeners(readfds); handle_listeners(readfds);
#endif #endif

3
common-session.c
View File

@ -162,6 +162,7 @@ void session_loop(void(*loophandler)()) {
/* We get woken up when signal handlers write to this pipe. /* We get woken up when signal handlers write to this pipe.
SIGCHLD in svr-chansession is the only one currently. */ SIGCHLD in svr-chansession is the only one currently. */
FD_SET(ses.signal_pipe[0], &readfd); FD_SET(ses.signal_pipe[0], &readfd);
ses.channel_signal_pending = 0;
/* set up for channels which can be read/written */ /* set up for channels which can be read/written */
setchannelfds(&readfd, &writefd, writequeue_has_space); setchannelfds(&readfd, &writefd, writequeue_has_space);
@ -211,7 +212,9 @@ void session_loop(void(*loophandler)()) {
wake up the select() above. */ wake up the select() above. */
if (FD_ISSET(ses.signal_pipe[0], &readfd)) { if (FD_ISSET(ses.signal_pipe[0], &readfd)) {
char x; char x;
TRACE(("signal pipe set"))
while (read(ses.signal_pipe[0], &x, 1) > 0) {} while (read(ses.signal_pipe[0], &x, 1) > 0) {}
ses.channel_signal_pending = 1;
} }
/* check for auth timeout, rekeying required etc */ /* check for auth timeout, rekeying required etc */