X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=372799778f8411f42a95506e49ad0443175dcb8f;hp=6007626dd57d5e14953b4f9b905e94fbc08d74c9;hb=ed218ece51e5be77fd8bd8f014b5f05708e4be5b;hpb=1135808bf9df44b879994e6dac07a31eb78c2fdb diff --git a/server.h b/server.h index 6007626..3727997 100644 --- a/server.h +++ b/server.h @@ -6,11 +6,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include "tlse.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,6 +49,9 @@ public: // Get the list of all currently connected clients. std::vector get_client_stats() const; + // See hls_zombies, below. + std::vector 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, @@ -52,20 +65,33 @@ public: // and the order between them are undefined. // XXX: header should ideally be ordered with respect to data. void add_client_deferred(int sock, Acceptor *acceptor); - void add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags); + void add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags, const RationalPTS &pts); // These should not be called while running, since that would violate // threading assumptions (ie., that epoll is only called from one thread // at the same time). - CubemapStateProto serialize(); - void add_client_from_serialized(const ClientProto &client); - int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding); + CubemapStateProto serialize(std::unordered_map *short_response_pool); + void add_client_from_serialized(const ClientProto &client, const std::vector> &short_responses); + int add_stream(const std::string &url, + const std::string &hls_url, + size_t bytes_received, + size_t prebuffering_bytes, + Stream::Encoding encoding, + Stream::Encoding src_encoding, + unsigned hls_frag_duration, + 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); void set_encoding(int stream_index, Stream::Encoding encoding); void set_src_encoding(int stream_index, Stream::Encoding encoding); + void set_hls_frag_duration(int stream_index, unsigned hls_frag_duration); + void set_hls_backlog_margin(int stream_index, size_t hls_backlog_margin); + void set_allow_origin(int stream_index, const std::string &allow_origin); + void register_hls_url(int stream_index, const std::string &hls_url); void add_gen204(const std::string &url, const std::string &allow_origin); void create_tls_context_for_acceptor(const Acceptor *acceptor); @@ -94,13 +120,13 @@ private: std::vector> streams; // Map from URL to index into . - std::map stream_url_map; + std::unordered_map stream_url_map, stream_hls_url_map; // Map from URL to CORS Allow-Origin header (or empty string). - std::map ping_url_map; + std::unordered_map ping_url_map; // Map from file descriptor to client. - std::map clients; + std::unordered_map clients; // A list of all clients, ordered by the time they connected (first element), // and their file descriptor (second element). It is ordered by connection time @@ -115,12 +141,28 @@ private: // the timespec matches). std::queue> 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 hls_zombies; + // Used for epoll implementation (obviously). int epoll_fd; epoll_event events[EPOLL_MAX_EVENTS]; // For each TLS-enabled acceptor, our private server context for its key pair. - std::map tls_server_contexts; + std::unordered_map tls_server_contexts; // The actual worker thread. virtual void do_work(); @@ -170,9 +212,13 @@ private: // Parse the HTTP request. Returns a HTTP status code (200/204/400/404). int parse_request(Client *client); - // Construct the HTTP header, and set the client into + // Construct the HTTP header for a regular stream, and set the client into // the SENDING_HEADER state. - void construct_header(Client *client); + void construct_stream_header(Client *client); + + // Construct a HLS playlist (or get it from the cache), and set the client into + // the SENDING_HEADER state. + void construct_hls_playlist(Client *client); // Construct a generic error with the given line, and set the client into // the SENDING_SHORT_RESPONSE state. @@ -185,6 +231,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 . + void start_client_timeout_timer(Client *client); }; #endif // !defined(_SERVER_H)