Open up for C++11.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index 2c663fbce37dd3d4e851a05de866bc7ceb9fb7e6..ce1bcef1caf299b82d3e9237b30fda2eead88633 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -57,9 +57,9 @@ CubemapStateProto ServerPool::serialize()
        return state;
 }
 
-void ServerPool::add_client(int sock)
+void ServerPool::add_client(int sock, Acceptor *acceptor)
 {
-       servers[clients_added++ % num_servers].add_client_deferred(sock);
+       servers[clients_added++ % num_servers].add_client_deferred(sock, acceptor);
 }
 
 void ServerPool::add_client_from_serialized(const ClientProto &client)
@@ -147,7 +147,7 @@ void ServerPool::set_header(int stream_index, const string &http_header, const s
        }
 }
 
-void ServerPool::add_data(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start)
+void ServerPool::add_data(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags)
 {
        assert(stream_index >= 0 && stream_index < ssize_t(num_http_streams + udp_streams.size()));
 
@@ -159,7 +159,7 @@ void ServerPool::add_data(int stream_index, const char *data, size_t bytes, Stre
 
        // HTTP stream.
        for (int i = 0; i < num_servers; ++i) {
-               servers[i].add_data_deferred(stream_index, data, bytes, suitable_for_stream_start);
+               servers[i].add_data_deferred(stream_index, data, bytes, metacube_flags);
        }
 }
 
@@ -170,6 +170,13 @@ void ServerPool::add_gen204(const std::string &url, const std::string &allow_ori
        }
 }
 
+void ServerPool::create_tls_context_for_acceptor(const Acceptor *acceptor)
+{
+       for (int i = 0; i < num_servers; ++i) {
+               servers[i].create_tls_context_for_acceptor(acceptor);
+       }
+}
+
 void ServerPool::run()
 {
        for (int i = 0; i < num_servers; ++i) {