X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=client.h;h=954ad41967878b123ea388fe9110f7d6b4069603;hp=9a189c0a9af709365944d11e6db37f75868161f0;hb=52d37b2815f4b144fbac899b7f9548353a6fbe3c;hpb=8d2593119a04e6b30d5c36a722a77ee32f1d454b

diff --git a/client.h b/client.h
index 9a189c0..954ad41 100644
--- a/client.h
+++ b/client.h
@@ -11,12 +11,14 @@ class ClientProto;
 struct Stream;
 
 // Digested statistics for writing to logs etc.
+// Note that "referer" and "user_agent" here are already escaped for scary characters.
 struct ClientStats {
-	std::string stream_id;
+	std::string url;
 	int sock;
-	int fwmark;
 	std::string remote_addr;
-	time_t connect_time;
+	std::string referer;
+	std::string user_agent;
+	timespec connect_time;
 	size_t bytes_sent;
 	size_t bytes_lost;
 	size_t num_loss_events;
@@ -34,14 +36,15 @@ struct Client {
 	// The file descriptor associated with this socket.
 	int sock;
 
-	// The fwmark associated with this socket (or 0).
-	int fwmark;
+	// When the client connected, in terms of CLOCK_MONOTONIC_COARSE.
+	timespec connect_time;
 
 	// Some information only used for logging.
 	std::string remote_addr;
-	time_t connect_time;
+	std::string referer;
+	std::string user_agent;
 
-	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR };
+	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR, WAITING_FOR_KEYFRAME, PREBUFFERING };
 	State state;
 
 	// The HTTP request, as sent by the client. If we are in READING_REQUEST,
@@ -50,7 +53,7 @@ struct Client {
 
 	// What stream we're connecting to; parsed from <request>.
 	// Not relevant for READING_REQUEST.
-	std::string stream_id;
+	std::string url;
 	Stream *stream;
 
 	// The header we want to send. This is nominally a copy of Stream::header,
@@ -63,7 +66,11 @@ struct Client {
 	size_t header_or_error_bytes_sent;
 
 	// Number of bytes we are into the stream (ie., the end of last send).
-	// Only relevant for SENDING_DATA.
+	// -1 means we want to send from the end of the backlog (the normal case),
+	// although only at a keyframe.
+	// -2 means we want to send from the _beginning_ of the backlog.
+	// Once we go into WAITING_FOR_KEYFRAME, PREBUFFERING or SENDING_DATA,
+	// these negative values will be translated to real numbers.
 	size_t stream_pos;
 
 	// Number of bytes we've sent of data. Only relevant for SENDING_DATA.