X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=state.proto;h=9f17e08e0b14d3ae5687c7e979f0636d7b987700;hp=88ad2d88206b6b84c231edebcc2e4bdcbaf5ac26;hb=12e46fa2d0a146685634811857d1d29c361c59e7;hpb=534764f026b82b144e974882c8e53c4cd8d21b68

diff --git a/state.proto b/state.proto
index 88ad2d8..9f17e08 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;
@@ -21,14 +21,8 @@ message StreamProto {
 	repeated int32 data_fds = 8;
 	optional int64 backlog_size = 5 [default=1048576];
 	optional int64 bytes_received = 3;
-	optional string stream_id = 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;
+	optional int64 last_suitable_starting_point = 9;
+	optional string url = 4;
 };
 
 // Corresponds to class Input.
@@ -39,15 +33,20 @@ 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 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 {