X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=client.h;h=3767112b759b2c0c85bcf804b2ca77106ef68f78;hp=d511698550f2d4d5af9234f2eb0671600a72da4e;hb=8a2935dc58b00839acc493b4d146042d22a9793c;hpb=889d72b31a646feeba52acd3fd2616210b550e71

diff --git a/client.h b/client.h
index d511698..3767112 100644
--- a/client.h
+++ b/client.h
@@ -12,9 +12,8 @@ struct Stream;
 
 // Digested statistics for writing to logs etc.
 struct ClientStats {
-	std::string stream_id;
+	std::string url;
 	int sock;
-	int fwmark;
 	std::string remote_addr;
 	time_t connect_time;
 	size_t bytes_sent;
@@ -23,7 +22,6 @@ struct ClientStats {
 };
 
 struct Client {
-	Client() {}
 	Client(int sock);
 
 	// Serialization/deserialization.
@@ -35,14 +33,11 @@ struct Client {
 	// The file descriptor associated with this socket.
 	int sock;
 
-	// The fwmark associated with this socket (or 0).
-	int fwmark;
-
 	// Some information only used for logging.
 	std::string remote_addr;
 	time_t connect_time;
 
-	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR };
+	enum State { READING_REQUEST, SENDING_HEADER, SENDING_DATA, SENDING_ERROR, WAITING_FOR_KEYFRAME };
 	State state;
 
 	// The HTTP request, as sent by the client. If we are in READING_REQUEST,
@@ -51,7 +46,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,
@@ -64,7 +59,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 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.