Fix a crash when trying to get HLS fragments from a disconnected strema.

[cubemap] / server.h

diff --git a/server.h b/server.h
index 4ec908b039c86b24db7b8b252d27a71515a71c60..0c172b5a306cc70f4fdd225d5708eaee4396b700 100644 (file)
--- a/server.h
+++ b/server.h
@@ -30,6 +30,16 @@ struct Stream;
 
 class CubemapStateProto;
 class StreamProto;
+class HLSZombieProto;
+
+// See Server::hls_zombies, below.
+struct HLSZombie {
+       std::string remote_addr;
+       std::string url;
+       std::string referer;
+       std::string user_agent;
+       timespec expires;
+};
 
 class Server : public Thread {
 public:
@@ -39,11 +49,17 @@ public:
        // Get the list of all currently connected clients.     
        std::vector<ClientStats> get_client_stats() const;
 
+       // See hls_zombies, below.
+       std::vector<HLSZombie> get_hls_zombies();
+
        // Set header (both HTTP header and any stream headers) for the given stream.
        void set_header(int stream_index,
                        const std::string &http_header,
                        const std::string &stream_header);
 
+       // Sets the given stream as unavailable (will always return 503 to new clients).
+       void set_unavailable(int stream_index);
+
        // Set that the given stream should use the given max pacing rate from now on.
        // NOTE: This should be set before any clients are connected!
        void set_pacing_rate(int stream_index, uint32_t pacing_rate);
@@ -69,6 +85,7 @@ public:
                       size_t hls_backlog_margin,
                       const std::string &allow_origin);
        int add_stream_from_serialized(const StreamProto &stream, int data_fd);
+       void add_hls_zombie_from_serialized(const HLSZombieProto &hls_zombie);
        int lookup_stream_by_url(const std::string &url) const;
        void set_backlog_size(int stream_index, size_t new_size);
        void set_prebuffering_bytes(int stream_index, size_t new_amount);
@@ -127,6 +144,22 @@ private:
        // the timespec matches).
        std::queue<std::pair<timespec, int>> clients_ordered_by_connect_time;
 
+       // HLS is harder to keep viewer statistics for than regular streams,
+       // since there's no 1:1 mapping between ongoing HTTP connections and
+       // actual viewers. After a HLS fragment has been successfully sent,
+       // we keep a note of that in this structure, so that we can add some
+       // fake entries in the .stats file for clients that we believe are still
+       // watching, but are not downloading anything right now. We clean this
+       // out whenever we write statistics centrally.
+       //
+       // The structure is keyed by X-Playback-Session-Id if it exists
+       // (typically iOS clients) or IP address otherwise; we can't use the socket,
+       // since clients can (and do) keep open multiple HTTP connections for
+       // the same video playack session, and may also close the socket
+       // between downloading fragments. This means multiple clients between
+       // the same NAT may be undercounted, but that's how it is.
+       std::unordered_map<std::string, HLSZombie> hls_zombies;
+
        // Used for epoll implementation (obviously).
        int epoll_fd;
        epoll_event events[EPOLL_MAX_EVENTS];
@@ -160,7 +193,7 @@ private:
        // Reads regular data fro ma socket. Returns -1 if the processing
        // should go to sleep (an error, or no data available yet), otherwise
        // the number of bytes read.
-       int read_nontls_data(Client *client, char *buf, size_t max_size);
+       int read_plain_data(Client *client, char *buf, size_t max_size);
 
        // Reads (decrypted) data from a TLS socket. Returns -1 if the processing
        // should go to sleep (an error, or no data available yet), otherwise
@@ -201,6 +234,10 @@ private:
        void skip_lost_data(Client *client);
 
        void add_client(int sock, Acceptor *acceptor);
+
+       // Mark that a client just went into READING_REQUEST state, so we should
+       // note the current time of day and then put it into <clients_ordered_by_connect_time>.
+       void start_client_timeout_timer(Client *client);
 };
 
 #endif  // !defined(_SERVER_H)