diff options
| author | Damien Miller <djm@mindrot.org> | 2001-10-10 15:08:36 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-10-10 15:08:36 +1000 |
| commit | c71f4e40b6d8cdf1c0d83381945841e66c127a95 (patch) | |
| tree | 8132842fd05322ca31d89d412f8799dd4077fed6 /serverloop.c | |
| parent | ae45246696fed011e1a9941d33b89669c74b3198 (diff) | |
| download | openssh-git-c71f4e40b6d8cdf1c0d83381945841e66c127a95.tar.gz | |
- markus@cvs.openbsd.org 2001/10/09 19:51:18
[serverloop.c]
close all channels if the connection to the remote host has been closed,
should fix sshd's hanging with WCHAN==wait
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/serverloop.c b/serverloop.c index 4577cc80..d7282fe2 100644 --- a/serverloop.c +++ b/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.79 2001/10/04 15:12:37 markus Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.80 2001/10/09 19:51:18 markus Exp $"); #include "xmalloc.h" #include "packet.h" @@ -699,6 +699,7 @@ server_loop2(Authctxt *authctxt) if (child_terminated) { while ((pid = waitpid(-1, &status, WNOHANG)) > 0) session_close_by_pid(pid, status); + /* XXX race */ child_terminated = 0; } if (!rekeying) @@ -708,6 +709,9 @@ server_loop2(Authctxt *authctxt) break; process_output(writeset); } + /* close all channels, no more reads and writes */ + channel_close_all(); + if (readset) xfree(readset); if (writeset) @@ -715,14 +719,14 @@ server_loop2(Authctxt *authctxt) mysignal(SIGCHLD, SIG_DFL); + /* collect dead children */ while ((pid = waitpid(-1, &status, WNOHANG)) > 0) session_close_by_pid(pid, status); /* - * there is a race between channel_free_all() killing children and - * children dying before kill() + * there is a race between channel_detach_all() killing remaining + * children and children dying before kill() */ channel_detach_all(); - channel_stop_listening(); while (session_have_children()) { pid = waitpid(-1, &status, 0); |