Keep a list of running children, and in each loop in main_loop(),

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 09d98f4..2e06a39 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -17,17 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.72 2000/11/15 01:28:21 zarq Exp $
+    $Id: net.c,v 1.35.4.74 2000/11/15 22:07:36 zarq Exp $
 */
 
 #include "config.h"
 
-#include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h */
-#include <sys/socket.h>
-#include <net/if.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <stdio.h>
@@ -39,6 +35,11 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+/* SunOS really wants sys/socket.h BEFORE net/if.h,
+   and FreeBSD wants these lines below the rest. */
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <net/if.h>
 
 #ifdef HAVE_OPENSSL_RAND_H
 # include <openssl/rand.h>
@@ -67,6 +68,7 @@
 
 #include "conf.h"
 #include "connlist.h"
+#include "list.h"
 #include "meta.h"
 #include "net.h"
 #include "netutl.h"
@@ -92,32 +94,14 @@ char *unknown = NULL;
 
 subnet_t mymac;
 
-/*
-  Execute the given script.
-  This function doesn't really belong here.
-*/
-int execute_script(const char *name)
+list_t *child_pids;
+
+void _execute_script(const char *name)
 {
+  int error = 0;
   char *scriptname;
-  pid_t pid;
   char *s;
-  int error;
-
-  if((pid = fork()) < 0)
-    {
-      syslog(LOG_ERR, _("System call `%s' failed: %m"),
-            "fork");
-      return -1;
-    }
-
-  if(pid)
-    {
-      return 0;
-    }
-
-  /* Child here */
-
-  error = 0;
+  int fd;
 
   if(netname)
     {
@@ -183,6 +167,61 @@ int execute_script(const char *name)
   exit(0);
 }
 
+/*
+  Execute the given script.
+  This function doesn't really belong here.
+*/
+int execute_script(const char *name)
+{
+  pid_t pid;
+
+  if((pid = fork()) < 0)
+    {
+      syslog(LOG_ERR, _("System call `%s' failed: %m"),
+            "fork");
+      return -1;
+    }
+
+  if(pid)
+    {
+      list_append(child_pids, pid);
+      return 0;
+    }
+
+  /* Child here */
+
+  _execute_script(name);
+}
+
+int check_child(void *data)
+{
+  pid_t pid;
+  int status;
+
+  pid = (pid_t) data;
+  pid = waitpid(pid, &status, WNOHANG);
+  if(WIFEXITED(status))
+    {
+      if(WIFSIGNALED(status)) /* Child was killed by a signal */
+       {
+         syslog(LOG_ERR, _("Child with PID %d was killed by signal %d (%s)"),
+                pid, WTERMSIG(status), strsignal(WTERMSIG(status)));
+         return -1;
+       }
+      if(WEXITSTATUS(status) != 0)
+       {
+         syslog(LOG_INFO, _("Child with PID %d exited with code %d"),
+                WEXITSTATUS(status));
+       }
+      return -1;
+    }
+}
+
+void check_children(void)
+{
+  list_forall_nodes(child_pids, check_child);
+}
+
 int xsend(conn_list_t *cl, vpn_packet_t *inpkt)
 {
   vpn_packet_t outpkt;
@@ -892,6 +931,8 @@ cp
   myself->status.active = 1;
 
   syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
+
+  child_pids = list_new();
 cp
   return 0;
 }
@@ -1097,7 +1138,7 @@ conn_list_t *create_new_connection(int sfd)
 cp
   p = new_conn_list();
 
-  if(getpeername(sfd, &ci, &len) < 0)
+  if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
     {
       syslog(LOG_ERR, _("System call `%s' failed: %m"),
             "getpeername");
@@ -1480,6 +1521,8 @@ cp
           if(FD_ISSET(tap_fd, &fset))
            handle_tap_input();
         }
+
+      check_children();
     }
 cp
 }