1 files changed, 14 insertions, 7 deletions

diff --git a/trace-listen.c b/trace-listen.c
index 3516258..e12431c 100644
--- a/trace-listen.c
+++ b/trace-listen.c
@@ -372,19 +372,12 @@ static void process_client(const char *node, const char *port, int fd)
 
 static int do_fork(int cfd)
 {
-        int status;
         pid_t pid;
-        int ret;
 
         /* in debug mode, we do not fork off children */
         if (debug)
                 return 0;
 
-        /* Clean up any children that has started before */
-        do {
-                ret = waitpid(0, &status, WNOHANG);
-        } while (ret > 0);
-
         pid = fork();
         if (pid < 0) {
                 warning("failed to create child");
@@ -443,6 +436,17 @@ static void do_connection(int cfd, struct sockaddr_storage *peer_addr,
                 exit(0);
 }
 
+static void clean_up(int sig)
+{
+        int status;
+        int ret;
+
+        /* Clean up any children that has started before */
+        do {
+                ret = waitpid(0, &status, WNOHANG);
+        } while (ret > 0);
+}
+
 static void do_listen(char *port)
 {
         struct addrinfo hints;
@@ -451,6 +455,9 @@ static void do_listen(char *port)
         struct sockaddr_storage peer_addr;
         socklen_t peer_addr_len;
 
+        if (!debug)
+                signal(SIGCHLD, clean_up);
+
         memset(&hints, 0, sizeof(hints));
         hints.ai_family = AF_UNSPEC;
         hints.ai_socktype = SOCK_STREAM;