Changeset 2449 for trunk

Timestamp:

Aug 30, 2011, 9:16:50 AM (13 years ago)

Author:

ldelgass

Message:

Fall back to fcntl to set FD_CLOEXEC on socket if accept4 isn't available

File:

• trunk/packages/vizservers/nanoscale/server2.c (modified) (3 diffs)

trunk/packages/vizservers/nanoscale/server2.c

@@ -15 +15 @@
 #include <syslog.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include <tcl.h>
+
+#include "config.h"
 
 #define TRUE    1
@@ -381 +384 @@
             /* Accept the new connection. */
             length = sizeof(newaddr);
+#ifdef HAVE_ACCEPT4
             f = accept4(serverPtr->listenerFd, (struct sockaddr *)&newaddr, 
                         &length, SOCK_CLOEXEC);
+#else
+            f = accept(serverPtr->listenerFd, (struct sockaddr *)&newaddr, 
+                       &length);
+#endif
             if (f < 0) {
                 ERROR("Can't accept server \"%s\": %s", serverPtr->name, 
@@ -388 +396 @@
                 exit(1);
             }
+#ifndef HAVE_ACCEPT4
+            int flags = fcntl(f, F_GETFD);
+            flags |= FD_CLOEXEC;
+            if (fcntl(f, F_SETFD, flags) < 0) {
+                ERROR("Can't set FD_CLOEXEC on socket \"%s\": %s", serverPtr->name, 
+                      strerror(errno));
+                exit(1);
+            }
+#endif
             INFO("Connecting \"%s\" to %s\n", serverPtr->name, 
                  inet_ntoa(newaddr.sin_addr));