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

diff --git a/acceptor.cpp b/acceptor.cpp
index 29a7f8c1f675d356f2af42047b473a9b82f44169..b3cd3c1bd92824d27840ef52a04b95bed22e5c62 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -21,12 +21,13 @@ extern ServerPool *servers;
 
 int create_server_socket(const sockaddr_in6 &addr, SocketType socket_type)
 {
+       // NOTE: We set as non-blocking, so the acceptor thread can notice that we want to shut it down.
        int server_sock;
        if (socket_type == TCP_SOCKET) {
-               server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
+               server_sock = socket(PF_INET6, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP);
        } else {
                assert(socket_type == UDP_SOCKET);
-               server_sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+               server_sock = socket(PF_INET6, SOCK_DGRAM | SOCK_NONBLOCK, IPPROTO_UDP);
        }
        if (server_sock == -1) {
                log_perror("socket");
@@ -46,12 +47,6 @@ int create_server_socket(const sockaddr_in6 &addr, SocketType socket_type)
                exit(1);
        }
 
-       // Set as non-blocking, so the acceptor thread can notice that we want to shut it down.
-       if (ioctl(server_sock, FIONBIO, &one) == -1) {
-               log_perror("ioctl(FIONBIO)");
-               exit(1);
-       }
-
        if (bind(server_sock, reinterpret_cast<const sockaddr *>(&addr), sizeof(addr)) == -1) {
                log_perror("bind");
                exit(1);

diff --git a/httpinput.cpp b/httpinput.cpp
index 715e31c4a162f8d9ce168969901ae3ca4253a8c9..9cacc1f0041e8ebccbaccf6c101c35d82a7c899a 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -153,24 +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);
-                       freeaddrinfo(base_ai);
-                       return -1;                      
-               }
-
                // Do a non-blocking connect.
                do {
                        err = connect(sock, ai->ai_addr, ai->ai_addrlen);
@@ -381,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);