Support multiple listening sockets. Actually mostly because it makes the code somewha...

[cubemap] / state.proto

diff --git a/state.proto b/state.proto
index 7d114da5d1a4328e42769e344c63270a891683d4..cfad404da66eca1cc4d77b8f476b5d9416ebff90 100644 (file)
--- a/state.proto
+++ b/state.proto
@@ -1,6 +1,8 @@
 // Corresponds to struct Client.
 message ClientProto {
        optional int32 sock = 1;
 // 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;
        optional int32 state = 2;
        optional bytes request = 3;
        optional string stream_id = 4;


@@ -17,9 +19,35 @@ message StreamProto {
        optional string stream_id = 4;
 };
 
        optional string stream_id = 4;
 };
 

+// 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 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 {
 message CubemapStateProto {

+       optional int64 serialize_start_sec = 6;
+       optional int64 serialize_start_usec = 7;

        repeated ClientProto clients = 1;
        repeated StreamProto streams = 2;
        repeated ClientProto clients = 1;
        repeated StreamProto streams = 2;

+       repeated InputProto inputs = 5;
+       repeated AcceptorProto acceptors = 8;
+
+       // Deprecated. Use Acceptor instead.

        optional int32 server_sock = 3;
        optional int32 port = 4;
 };
        optional int32 server_sock = 3;
        optional int32 port = 4;
 };