- stevesk@cvs.openbsd.org 2001/06/30 18:08:40
[channels.c channels.h clientloop.c]
adress -> address; ok markus@
+ - markus@cvs.openbsd.org 2001/07/02 13:59:15
+ [serverloop.c session.c session.h]
+ wait until !session_have_children(); bugreport from
+ Lutz.Jaenicke@aet.TU-Cottbus.DE
20010629
- (bal) Removed net_aton() since we don't use it any more
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.72 2001/06/27 02:12:52 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.73 2001/07/02 13:59:14 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
if (writeset)
xfree(writeset);
- channel_free_all();
-
signal(SIGCHLD, SIG_DFL);
+
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()
+ */
+ channel_free_all();
+
+ while (session_have_children()) {
+ pid = waitpid(-1, &status, 0);
+ if (pid > 0)
+ session_close_by_pid(pid, status);
+ else {
+ error("waitpid returned %d: %s", pid, strerror(errno));
+ break;
+ }
+ }
}
static void
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.97 2001/06/27 02:12:53 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.98 2001/07/02 13:59:15 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
session_close(s);
}
+int
+session_have_children(void)
+{
+ int i;
+
+ for(i = 0; i < MAX_SESSIONS; i++) {
+ Session *s = &sessions[i];
+ if (s->used && s->pid != -1) {
+ debug("session_have_children: id %d pid %d", i, s->pid);
+ return 1;
+ }
+ }
+ debug("session_have_children: no more children");
+ return 0;
+}
+
/*
* this is called when a channel dies before
* the session 'child' itself dies
-/* $OpenBSD: session.h,v 1.10 2001/06/27 02:12:54 markus Exp $ */
+/* $OpenBSD: session.h,v 1.11 2001/07/02 13:59:15 markus Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
void session_input_channel_req(int, void *);
void session_close_by_pid(pid_t, int);
void session_close_by_channel(int, void *);
+int session_have_children(void);
#endif