Move Server:add_data() into Stream, where it more logically belongs.

[cubemap] / state.proto

diff --git a/state.proto b/state.proto
index 8fc632148e591fc78a5e6461190acfc0a90d339f..17d5edc419ba340eca2693b65f7866d335fb1ea3 100644 (file)
--- a/state.proto
+++ b/state.proto
@@ -1,6 +1,8 @@
 // Corresponds to struct Client.
 message ClientProto {
        optional int32 sock = 1;
+       optional string remote_addr = 8;
+       optional int64 connect_time = 9;
        optional int32 state = 2;
        optional bytes request = 3;
        optional string stream_id = 4;
@@ -13,7 +15,8 @@ message ClientProto {
 message StreamProto {
        optional bytes header = 1;
        optional bytes data = 2;
-       optional int64 data_size = 3;
+       optional int64 backlog_size = 5 [default=1048576];
+       optional int64 bytes_received = 3;
        optional string stream_id = 4;
 };
 
@@ -25,15 +28,23 @@ message InputProto {
        optional bytes request = 4;
        optional int32 request_bytes_sent = 5;
        optional bytes response = 6;
+       optional bytes http_header = 10;
        optional bytes pending_data = 7;
        optional bool has_metacube_header = 8;
        optional int32 sock = 9;
 };
 
+// Corresponds to class Acceptor.
+message AcceptorProto {
+       optional int32 server_sock = 1;
+       optional int32 port = 2;
+};
+
 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;
 };