Use unique_ptr a few places instead of explicit delete.

[cubemap] / serverpool.h

diff --git a/serverpool.h b/serverpool.h
index c72623da13664fca6d54809f42bfb0393ac22835..87f3f8e4d1837054a036dc0b96e66767f8014312 100644 (file)
--- a/serverpool.h
+++ b/serverpool.h
@@ -2,6 +2,7 @@
 #define _SERVERPOOL_H 1
 
 #include <stddef.h>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -10,6 +11,7 @@
 #include "stream.h"
 #include "udpstream.h"
 
+class Acceptor;
 class Server;
 class UDPStream;
 struct ClientStats;
@@ -19,13 +21,12 @@ struct sockaddr_in6;
 class ServerPool {
 public:
        ServerPool(int num_servers);
-       ~ServerPool();
 
        // Fills streams() and clients().
        CubemapStateProto serialize();
 
        // Picks a server (round-robin) and allocates the given client to it.
-       void add_client(int sock);
+       void add_client(int sock, Acceptor *acceptor);
        void add_client_from_serialized(const ClientProto &client);
 
        // Adds the given stream to all the servers. Returns the stream index.
@@ -61,6 +62,10 @@ public:
        // Adds the given gen204 endpoint to all the servers.
        void add_gen204(const std::string &url, const std::string &allow_origin);
 
+       // Prepares all the servers for accepting TLS connections from the given acceptor.
+       // (They need a private context, since the contexts are not definde to be thread-safe.)
+       void create_tls_context_for_acceptor(const Acceptor *acceptor);
+
        // Starts all the servers.
        void run();
 
@@ -70,7 +75,7 @@ public:
        std::vector<ClientStats> get_client_stats() const;
 
 private:
-       Server *servers;
+       std::unique_ptr<Server[]> servers;
        int num_servers, clients_added;
 
        // Our indexing is currently rather primitive; every stream_index in
@@ -78,7 +83,7 @@ private:
        // has exactly one copy), and after that, it's mapping directly into
        // <udp_streams>.
        int num_http_streams;
-       std::vector<UDPStream *> udp_streams;
+       std::vector<std::unique_ptr<UDPStream>> udp_streams;
 
        ServerPool(const ServerPool &);
 };