X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=state.proto;h=cd172535ad315a484f3459d9a932a25f396be2a1;hp=bfacdbf4ecf202fea59e602dd673ecee345d6110;hb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05;hpb=a0949bd6af9a604e7073354fc530353bbdb7871c

diff --git a/state.proto b/state.proto
index bfacdbf..cd17253 100644
--- a/state.proto
+++ b/state.proto
@@ -5,7 +5,7 @@ message ClientProto {
 	optional int64 connect_time = 9;
 	optional int32 state = 2;
 	optional bytes request = 3;
-	optional string stream_id = 4;
+	optional string url = 4;
 	optional bytes header_or_error = 5;
 	optional int64 header_or_error_bytes_sent = 6;
 	optional int64 stream_pos = 7;
@@ -16,31 +16,44 @@ message ClientProto {
 
 // Corresponds to struct Stream.
 message StreamProto {
-	optional bytes header = 1;
-	optional bytes data = 2;
+	optional bytes http_header = 6;
+	optional bytes stream_header = 7;
+	repeated int32 data_fds = 8;
 	optional int64 backlog_size = 5 [default=1048576];
 	optional int64 bytes_received = 3;
-	optional string stream_id = 4;
+	optional int64 last_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.
 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 {