Remove mark= from cubemap.config.sample, as the option no longer exists.

[cubemap] / state.proto

diff --git a/state.proto b/state.proto
index 1776280f7e9df945f67b647ea46c1f708eaedcbe..9f17e08e0b14d3ae5687c7e979f0636d7b987700 100644 (file)
--- a/state.proto
+++ b/state.proto
@@ -21,14 +21,8 @@ message StreamProto {
        repeated int32 data_fds = 8;
        optional int64 backlog_size = 5 [default=1048576];
        optional int64 bytes_received = 3;
+       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.
@@ -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 {