X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=state.proto;h=9799c0d29e9bb4d7c65aa0b0be5e3ee16eb0deea;hp=99c1e92e657eaf15906f28b5dfa194b0e6ae17f0;hb=029aca758029094d6e9d59e8d88babce94c412e4;hpb=b3cabe9eb67ad22e671cc47408641b4a24a1af0a

diff --git a/state.proto b/state.proto
index 99c1e92..9799c0d 100644
--- a/state.proto
+++ b/state.proto
@@ -1,17 +1,22 @@
+syntax = "proto2";
+
 // Corresponds to struct Client.
 message ClientProto {
 	optional int32 sock = 1;
 	optional string remote_addr = 8;
-	optional int64 connect_time = 9;
+	optional int64 connect_time_sec = 13;
+	optional int32 connect_time_nsec = 14;
 	optional int32 state = 2;
 	optional bytes request = 3;
 	optional string url = 4;
-	optional bytes header_or_error = 5;
-	optional int64 header_or_error_bytes_sent = 6;
+	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.
@@ -19,17 +24,11 @@ message StreamProto {
 	optional bytes http_header = 6;
 	optional bytes stream_header = 7;
 	repeated int32 data_fds = 8;
-	optional int64 backlog_size = 5 [default=1048576];
+	optional int64 backlog_size = 5 [default=10485760];
+	optional int64 prebuffering_bytes = 10 [default=0];
 	optional int64 bytes_received = 3;
-	optional int64 last_suitable_starting_point = 9;
+	repeated int64 suitable_starting_point = 9;
 	optional string url = 4;
-
-	// Older versions stored the HTTP and video headers together in this field.
-	optional bytes header = 1;
-
-	// Older versions stored the data in the protobuf instead of sending file
-	// descriptors around.
-	optional bytes data = 2;
 };
 
 // Corresponds to class Input.
@@ -40,18 +39,23 @@ message InputProto {
 	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 metadata_bytes_received = 16;
+	optional double latency_sec = 17;
 	optional int64 connect_time = 13;
+	optional bool is_metacube_encoded = 15 [default=true];
 };
 
 // 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 {