tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-26 07:25:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix connecting sock to finalize before reporting write enabled

Browse Source
This commit is contained in:
Manoj Ampalam 2016-03-19 20:40:55 -07:00
parent bf74d01af3
commit f33bb99b94
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/win32/win32compat/w32fd.c
View File

@ -653,10 +653,6 @@ w32_select(int fds, w32_fd_set* readfds, w32_fd_set* writefds, w32_fd_set* excep
if (writefds && FD_ISSET(i, writefds)) { if (writefds && FD_ISSET(i, writefds)) {
in_set_fds++; in_set_fds++;
if (w32_io_is_io_available(fd_table.w32_ios[i], FALSE)) { if (w32_io_is_io_available(fd_table.w32_ios[i], FALSE)) {
/* for connect() completed sockets finish WSA connect process*/
if ((fd_table.w32_ios[i]->type == SOCK_FD)
&& ((fd_table.w32_ios[i]->internal.state == SOCK_CONNECTING)))
socketio_finish_connect(fd_table.w32_ios[i]);
FD_SET(i, &write_ready_fds); FD_SET(i, &write_ready_fds);
out_ready_fds++; out_ready_fds++;
} }
@ -676,9 +672,23 @@ w32_select(int fds, w32_fd_set* readfds, w32_fd_set* writefds, w32_fd_set* excep
if (writefds) if (writefds)
for (i = 0; i < fds; i++) for (i = 0; i < fds; i++)
if (FD_ISSET(i, writefds) && (!FD_ISSET(i, &write_ready_fds))) if (FD_ISSET(i, writefds)) {
FD_CLR(i, writefds); if (FD_ISSET(i, &write_ready_fds)) {
/* for connect() completed sockets finish WSA connect process*/
if ((fd_table.w32_ios[i]->type == SOCK_FD)
&& ((fd_table.w32_ios[i]->internal.state == SOCK_CONNECTING)))
if (socketio_finish_connect(fd_table.w32_ios[i]) != 0) {
/* finalizeing connect failed - recored error */
/* error gets picked up later recv and/or send*/
fd_table.w32_ios[i]->read_details.error = errno;
fd_table.w32_ios[i]->write_details.error = errno;
fd_table.w32_ios[i]->internal.state = SOCK_CONNECTED;
errno = 0;
}
}
else
FD_CLR(i, writefds);
}
debug3("select - returning %d", out_ready_fds); debug3("select - returning %d", out_ready_fds);
return out_ready_fds; return out_ready_fds;

2
serverloop.c
View File

@ -868,7 +868,7 @@ collect_children(void)
{ {
s = session_get(&i); s = session_get(&i);
if (s != NULL) if ((s != NULL) && (s->pid != 0))
{ {
if (WaitForSingleObject(s -> pid, 0) == 0) if (WaitForSingleObject(s -> pid, 0) == 0)
{ {