X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=state.proto;h=cfad404da66eca1cc4d77b8f476b5d9416ebff90;hp=7c9ca7fe43ce9f661aa97652865b79a4089a4286;hb=684496ba9c7def1421d045435b6b92e80bc54c74;hpb=20e478b83e754fd9b19d58abe79732fa0dd20ffc

diff --git a/state.proto b/state.proto
index 7c9ca7f..cfad404 100644
--- a/state.proto
+++ b/state.proto
@@ -1,11 +1,13 @@
 // 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 bytes header = 5;
-	optional int64 header_bytes_sent = 6;
+	optional bytes header_or_error = 5;
+	optional int64 header_or_error_bytes_sent = 6;
 	optional int64 bytes_sent = 7;
 };
 
@@ -14,9 +16,38 @@ message StreamProto {
 	optional bytes header = 1;
 	optional bytes data = 2;
 	optional int64 data_size = 3;
+	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 {
+	optional int64 serialize_start_sec = 6;
+	optional int64 serialize_start_usec = 7;
 	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;
 };