X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=state.proto;h=e6aefb51f7515bf4d6306e6303461d50805cbf9a;hp=942254012ffae5a309ed6bf6f95c1a965e2fe8dc;hb=a8c43c314bbda25fa53b487042b4f8f85cb34c2d;hpb=2fbbdf3c4a4ffd2d90c102a37c7a02b5b6f80216

diff --git a/state.proto b/state.proto
index 9422540..e6aefb5 100644
--- a/state.proto
+++ b/state.proto
@@ -1,21 +1,25 @@
+syntax = "proto2";
+
 // Corresponds to struct Client.
 message ClientProto {
 	optional int32 sock = 1;
 	optional string remote_addr = 8;
-	optional int64 connect_time_old = 9;  // Contains a time_t from time(). For versions prior to 1.1.3.
 	optional int64 connect_time_sec = 13;
 	optional int32 connect_time_nsec = 14;
 	optional int32 state = 2;
 	optional bytes request = 3;
 	optional string url = 4;
-	optional bytes header_or_error = 5;
-	optional int64 header_or_error_bytes_sent = 6;
+	optional bytes header_or_short_response = 5;
+	optional int64 header_or_short_response_bytes_sent = 6;
 	optional int64 stream_pos = 7;
 	optional int64 bytes_sent = 10;
 	optional int64 bytes_lost = 11;
 	optional int64 num_loss_events = 12;
 	optional bytes referer = 15;
 	optional bytes user_agent = 16;
+	optional bytes tls_context = 17;  // If not present, then not using TLS for this client.
+	optional int64 tls_output_bytes_already_consumed = 18;
+	optional bool in_ktls_mode = 19;
 };
 
 // Corresponds to struct Stream.
@@ -24,7 +28,7 @@ message StreamProto {
 	optional bytes stream_header = 7;
 	repeated int32 data_fds = 8;
 	optional int64 backlog_size = 5 [default=10485760];
-	optional int64 prebuffering_bytes = 10 [default=0];
+	// Tag 10 is unused from 1.4.0 up (it used to be prebuffering_bytes).
 	optional int64 bytes_received = 3;
 	repeated int64 suitable_starting_point = 9;
 	optional string url = 4;
@@ -44,7 +48,10 @@ message InputProto {
 	optional int32 sock = 9;
 	optional int64 bytes_received = 11;
 	optional int64 data_bytes_received = 12;
+	optional int64 metadata_bytes_received = 16;
+	optional double latency_sec = 17;
 	optional int64 connect_time = 13;
+	optional bool is_metacube_encoded = 15 [default=true];
 };
 
 // Corresponds to class Acceptor.
@@ -52,6 +59,8 @@ message AcceptorProto {
 	optional int32 server_sock = 1;
 	optional int32 port = 2;
 	optional string addr = 3;  // As a string. Empty is equivalent to "::".
+	optional bytes certificate_chain = 4;
+	optional bytes private_key = 5;
 };
 
 message CubemapStateProto {