Bump version number to 1.1.3-pre.

[cubemap] / acceptor.cpp

diff --git a/acceptor.cpp b/acceptor.cpp
index 2abfa5220064ec47efb8d40c41d3ad9ceed6a79d..593e4d4eb9cc207fce83730aee1c29e7a35519f2 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <poll.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,7 +19,7 @@ using namespace std;
 
 extern ServerPool *servers;
 
-int create_server_socket(int port, SocketType socket_type)
+int create_server_socket(const sockaddr_in6 &addr, SocketType socket_type)
 {
        int server_sock;
        if (socket_type == TCP_SOCKET) {
@@ -51,12 +52,7 @@ int create_server_socket(int port, SocketType socket_type)
                exit(1);
        }
 
-       sockaddr_in6 addr;
-       memset(&addr, 0, sizeof(addr));
-       addr.sin6_family = AF_INET6;
-       addr.sin6_port = htons(port);
-
-       if (bind(server_sock, reinterpret_cast<sockaddr *>(&addr), sizeof(addr)) == -1) {
+       if (bind(server_sock, reinterpret_cast<const sockaddr *>(&addr), sizeof(addr)) == -1) {
                log_perror("bind");
                exit(1);
        }
@@ -70,24 +66,52 @@ int create_server_socket(int port, SocketType socket_type)
 
        return server_sock;
 }
+
+sockaddr_in6 create_any_address(int port)
+{
+       sockaddr_in6 sin6;
+       memset(&sin6, 0, sizeof(sin6));
+       sin6.sin6_family = AF_INET6;
+       sin6.sin6_port = htons(port);
+       return sin6;
+}
+
+sockaddr_in6 extract_address_from_acceptor_proto(const AcceptorProto &proto)
+{
+       sockaddr_in6 sin6;
+       memset(&sin6, 0, sizeof(sin6));
+       sin6.sin6_family = AF_INET6;
+
+       if (!proto.addr().empty()) {
+               int ret = inet_pton(AF_INET6, proto.addr().c_str(), &sin6.sin6_addr);
+               assert(ret == 1);
+       }
+
+       sin6.sin6_port = htons(proto.port());
+       return sin6;
+}
        
-Acceptor::Acceptor(int server_sock, int port)
+Acceptor::Acceptor(int server_sock, const sockaddr_in6 &addr)
        : server_sock(server_sock),
-         port(port)
+         addr(addr)
 {
 }
 
 Acceptor::Acceptor(const AcceptorProto &serialized)
        : server_sock(serialized.server_sock()),
-         port(serialized.port())
+         addr(extract_address_from_acceptor_proto(serialized))
 {
 }
 
 AcceptorProto Acceptor::serialize() const
 {
+       char buf[INET6_ADDRSTRLEN];
+       inet_ntop(addr.sin6_family, &addr.sin6_addr, buf, sizeof(buf));
+
        AcceptorProto serialized;
        serialized.set_server_sock(server_sock);
-       serialized.set_port(port);
+       serialized.set_addr(buf);
+       serialized.set_port(ntohs(addr.sin6_port));
        return serialized;
 }
 
@@ -120,10 +144,18 @@ void Acceptor::do_work()
                // Set the socket as nonblocking.
                int one = 1;
                if (ioctl(sock, FIONBIO, &one) == -1) {
-                       log_perror("FIONBIO");
+                       log_perror("ioctl(FIONBIO)");
                        exit(1);
                }
 
+               // Enable TCP_CORK for maximum throughput. In the rare case that the
+               // stream stops entirely, this will cause a small delay (~200 ms)
+               // before the last part is sent out, but that should be fine.
+               if (setsockopt(sock, SOL_TCP, TCP_CORK, &one, sizeof(one)) == -1) {
+                       log_perror("setsockopt(TCP_CORK)");
+                       // Can still continue.
+               }
+
                // Pick a server, round-robin, and hand over the socket to it.
                servers->add_client(sock);
        }