X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=state.proto;h=c7c7e70286eac11e43c87c725cc9d26d26b608cb;hp=663e9d00c204000465815ddeb988221bdc48e9c7;hb=38a2bb28fd8dcb5bb1e0cb56028936a35f20f503;hpb=019b96a9cc6fa2902690e98a2aa033517efef3ed

diff --git a/state.proto b/state.proto
index 663e9d0..c7c7e70 100644
--- a/state.proto
+++ b/state.proto
@@ -2,41 +2,63 @@
 message ClientProto {
 	optional int32 sock = 1;
 	optional string remote_addr = 8;
-	optional int64 connect_time = 9;
+	optional int64 connect_time_old = 9;  // Contains a time_t from time(). For versions prior to 1.1.3.
+	optional int64 connect_time_sec = 13;
+	optional int32 connect_time_nsec = 14;
 	optional int32 state = 2;
 	optional bytes request = 3;
-	optional string stream_id = 4;
-	optional bytes header_or_error = 5;
-	optional int64 header_or_error_bytes_sent = 6;
-	optional int64 bytes_sent = 7;
+	optional string url = 4;
+	optional bytes header_or_short_response = 5;
+	optional int64 header_or_short_response_bytes_sent = 6;
+	optional int64 stream_pos = 7;
+	optional int64 bytes_sent = 10;
+	optional int64 bytes_lost = 11;
+	optional int64 num_loss_events = 12;
+	optional bytes referer = 15;
+	optional bytes user_agent = 16;
 };
 
 // Corresponds to struct Stream.
 message StreamProto {
-	optional bytes header = 1;
-	optional bytes data = 2;
-	optional int64 data_size = 3;
-	optional string stream_id = 4;
+	optional bytes http_header = 6;
+	optional bytes stream_header = 7;
+	repeated int32 data_fds = 8;
+	optional int64 backlog_size = 5 [default=10485760];
+	optional int64 prebuffering_bytes = 10 [default=0];
+	optional int64 bytes_received = 3;
+	repeated int64 suitable_starting_point = 9;
+	optional string url = 4;
 };
 
 // Corresponds to class Input.
 message InputProto {
 	optional int32 state = 1;
-	optional string stream_id = 2;
 	optional string url = 3;
 	optional bytes request = 4;
 	optional int32 request_bytes_sent = 5;
 	optional bytes response = 6;
 	optional bytes http_header = 10;
+	optional bytes stream_header = 14;
 	optional bytes pending_data = 7;
 	optional bool has_metacube_header = 8;
 	optional int32 sock = 9;
+	optional int64 bytes_received = 11;
+	optional int64 data_bytes_received = 12;
+	optional int64 connect_time = 13;
+};
+
+// Corresponds to class Acceptor.
+message AcceptorProto {
+	optional int32 server_sock = 1;
+	optional int32 port = 2;
+	optional string addr = 3;  // As a string. Empty is equivalent to "::".
 };
 
 message CubemapStateProto {
+	optional int64 serialize_start_sec = 6;
+	optional int64 serialize_start_usec = 7;
 	repeated ClientProto clients = 1;
 	repeated StreamProto streams = 2;
 	repeated InputProto inputs = 5;
-	optional int32 server_sock = 3;
-	optional int32 port = 4;
+	repeated AcceptorProto acceptors = 8;
 };