Set close-on-exec on all file descriptors we open.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index cbffe3ae26292e11dd550156fce840120dd3031e..d0e1c5c82135f42bf7ac1b75e77d90af5d4a5402 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <math.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -73,6 +74,10 @@ HTTPInput::HTTPInput(const InputProto &serialized)
          has_metacube_header(serialized.has_metacube_header()),
          sock(serialized.sock())
 {
+       // Set back the close-on-exec flag for the socket.
+       // (This can't leak into a child, since we haven't been started yet.)
+       fcntl(sock, F_SETFD, 1);
+
        pending_data.resize(serialized.pending_data().size());
        memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
 
@@ -111,6 +116,10 @@ void HTTPInput::close_socket()
 
 InputProto HTTPInput::serialize() const
 {
+       // Unset the close-on-exec flag for the socket.
+       // (This can't leak into a child, since there's only one thread left.)
+       fcntl(sock, F_SETFD, 0);
+
        InputProto serialized;
        serialized.set_state(state);
        serialized.set_url(url);
@@ -153,24 +162,14 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
 
        // Connect to everything in turn until we have a socket.
        for ( ; ai && !should_stop(); ai = ai->ai_next) {
-               int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+               // Now do a non-blocking connect. This is important because we want to be able to be
+               // woken up, even though it's rather cumbersome.
+               int sock = socket(ai->ai_family, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, IPPROTO_TCP);
                if (sock == -1) {
                        // Could be e.g. EPROTONOSUPPORT. The show must go on.
                        continue;
                }
 
-               // Now do a non-blocking connect. This is important because we want to be able to be
-               // woken up, even though it's rather cumbersome.
-
-               // Set the socket as nonblocking.
-               int one = 1;
-               if (ioctl(sock, FIONBIO, &one) == -1) {
-                       log_perror("ioctl(FIONBIO)");
-                       safe_close(sock);
-                       freeaddrinfo(base_ai);
-                       return -1;                      
-               }
-
                // Do a non-blocking connect.
                do {
                        err = connect(sock, ai->ai_addr, ai->ai_addrlen);
@@ -340,7 +339,8 @@ void HTTPInput::do_work()
                        pending_data.clear();
                        has_metacube_header = false;
                        for (int stream_index : stream_indices) {
-                               servers->set_header(stream_index, "", "");
+                               // Don't zero out the header; it might still be of use to HLS clients.
+                               servers->set_unavailable(stream_index);
                        }
 
                        {
@@ -380,16 +380,10 @@ void HTTPInput::do_work()
                        ++num_connection_attempts;
                        sock = lookup_and_connect(host, port);
                        if (sock != -1) {
-                               // Yay, successful connect. Try to set it as nonblocking.
-                               int one = 1;
-                               if (ioctl(sock, FIONBIO, &one) == -1) {
-                                       log_perror("ioctl(FIONBIO)");
-                                       state = CLOSING_SOCKET;
-                               } else {
-                                       state = SENDING_REQUEST;
-                                       request = "GET " + path + " HTTP/1.0\r\nHost: " + host_header(host, port) + "\r\nUser-Agent: cubemap\r\n\r\n";
-                                       request_bytes_sent = 0;
-                               }
+                               // Yay, successful connect.
+                               state = SENDING_REQUEST;
+                               request = "GET " + path + " HTTP/1.0\r\nHost: " + host_header(host, port) + "\r\nUser-Agent: cubemap\r\n\r\n";
+                               request_bytes_sent = 0;
 
                                lock_guard<mutex> lock(stats_mutex);
                                stats.connect_time = time(nullptr);