X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=client.h;h=1a7f2a46216dd4f48849860cd4bd6ad2ef1c7286;hp=c18df4aaa06eed0a49f1241240c92581fd64615f;hb=31d5c83783aa338e589029a4e6f3f3a4159372b2;hpb=81253bd40254831a82a3d87c3ed7f2a3524f2f57

diff --git a/client.h b/client.h
index c18df4a..1a7f2a4 100644
--- a/client.h
+++ b/client.h
@@ -28,6 +28,7 @@ struct ClientStats {
 	size_t bytes_sent;
 	size_t bytes_lost;
 	size_t num_loss_events;
+	std::string hls_zombie_key;
 };
 
 struct Client {
@@ -39,16 +40,25 @@ struct Client {
 
 	ClientStats get_stats() const;
 
+	std::string get_hls_zombie_key() const {
+		if (x_playback_session_id.empty()) {
+			return remote_addr;
+		} else {
+			return x_playback_session_id;
+		}
+	}
+
 	// The file descriptor associated with this socket.
 	int sock;
 
-	// When the client connected, in terms of CLOCK_MONOTONIC_COARSE.
+	// When the client connected (or went into keepalive), in terms of CLOCK_MONOTONIC_COARSE.
 	timespec connect_time;
 
 	// Some information only used for logging.
 	std::string remote_addr;
 	std::string referer;
 	std::string user_agent;
+	std::string x_playback_session_id;
 
 	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_SHORT_RESPONSE, WAITING_FOR_KEYFRAME, PREBUFFERING };
 	State state = READING_REQUEST;
@@ -63,6 +73,9 @@ struct Client {
 	Stream *stream = nullptr;
 
 	// If true, we don't actually serve the stream, but its HLS playlist.
+	// TODO: Maybe this shouldn't be part of Client, since it's only
+	// really used in communicating once from parse_request() to
+	// process_client(); it's not permanent state (and is not serialized).
 	bool serving_hls_playlist = false;
 
 	// Whether we should close the connection after sending the response.