Use nullptr instead of NULL everywhere.

[cubemap] / serverpool.cpp

diff --git a/serverpool.cpp b/serverpool.cpp
index 3e79b45ba41d065aa19021efe549eb1b65c08be6..232ccea72a1acdc01fef8104c8f7048e7cb28a8c 100644 (file)
--- a/serverpool.cpp
+++ b/serverpool.cpp
@@ -22,15 +22,6 @@ ServerPool::ServerPool(int size)
 {
 }
 
-ServerPool::~ServerPool()
-{
-       delete[] servers;
-
-       for (size_t i = 0; i < udp_streams.size(); ++i) {
-               delete udp_streams[i];
-       }
-}
-       
 CubemapStateProto ServerPool::serialize()
 {
        CubemapStateProto state;
@@ -49,17 +40,17 @@ CubemapStateProto ServerPool::serialize()
                                state.mutable_streams(j)->add_data_fds(local_state.streams(j).data_fds(0));
                        }
                }
-               for (int j = 0; j < local_state.clients_size(); ++j) {
-                       state.add_clients()->MergeFrom(local_state.clients(j));
+               for (const ClientProto &client : local_state.clients()) {
+                       state.add_clients()->MergeFrom(client);
                }
         }
 
        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)
@@ -69,7 +60,7 @@ void ServerPool::add_client_from_serialized(const ClientProto &client)
 
 int ServerPool::lookup_stream_by_url(const string &url) const
 {
-       assert(servers != NULL);
+       assert(servers != nullptr);
        return servers[0].lookup_stream_by_url(url);
 }
 
@@ -123,7 +114,7 @@ int ServerPool::add_stream_from_serialized(const StreamProto &stream, const vect
        
 int ServerPool::add_udpstream(const sockaddr_in6 &dst, int pacing_rate, int ttl, int multicast_iface_index)
 {
-       udp_streams.push_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index));
+       udp_streams.emplace_back(new UDPStream(dst, pacing_rate, ttl, multicast_iface_index));
        return num_http_streams + udp_streams.size() - 1;
 }
 
@@ -170,6 +161,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) {