Simplify setting the non-blocking flag when creating HTTP sockets.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index b9695965c164d8009446a3aba18470eddf349402..9cacc1f0041e8ebccbaccf6c101c35d82a7c899a 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -153,23 +153,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, 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);
-                       return -1;                      
-               }
-
                // Do a non-blocking connect.
                do {
                        err = connect(sock, ai->ai_addr, ai->ai_addrlen);
@@ -249,17 +240,15 @@ bool HTTPInput::parse_response(const string &request)
                return false;
        }
 
-       multimap<string, string> parameters = extract_headers(lines, url);
+       HTTPHeaderMultimap parameters = extract_headers(lines, url);
 
        // Remove “Content-encoding: metacube”.
-       // TODO: Make case-insensitive.
-       const auto encoding_it = parameters.find("Content-encoding");
+       const auto encoding_it = parameters.find("Content-Encoding");
        if (encoding_it != parameters.end() && encoding_it->second == "metacube") {
                parameters.erase(encoding_it);
        }
 
        // Change “Server: foo” to “Server: metacube/0.1 (reflecting: foo)”
-       // TODO: Make case-insensitive.
        // XXX: Use a Via: instead?
        if (parameters.count("Server") == 0) {
                parameters.insert(make_pair("Server", SERVER_IDENTIFICATION));
@@ -273,7 +262,6 @@ bool HTTPInput::parse_response(const string &request)
        }
 
        // Erase “Connection: close”; we'll set it on the sending side if needed.
-       // TODO: Make case-insensitive.
        parameters.erase("Connection");
 
        // Construct the new HTTP header.
@@ -342,7 +330,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);
                        }
 
                        {
@@ -382,16 +371,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);