X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=d6e6e618c1c296fa10187c7fbd4fedb7712d4f02;hp=cfb6b2e13680409314ba444f68dc023666d8de31;hb=18a554f90798ccc30999e387054a4a6fcc75a7ce;hpb=f2e7dbf218365e3f47b942ea999796b2724ccc24

diff --git a/server.h b/server.h
index cfb6b2e..d6e6e61 100644
--- 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,6 +49,9 @@ 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,
@@ -69,6 +82,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 +141,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 +190,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