Refer to streams internally mostly by an index, not the stream_id.

[cubemap] / client.h

diff --git a/client.h b/client.h
index e82b48758d677740132498f2ca1049151fd34250..c73810df5e726297e8258c3997df3498fe32e7c7 100644 (file)
--- a/client.h
+++ b/client.h
@@ -12,14 +12,17 @@ struct Stream;
 
 // Digested statistics for writing to logs etc.
 struct ClientStats {
-       std::string stream_id;
+       std::string url;
+       int sock;
+       int fwmark;
        std::string remote_addr;
        time_t connect_time;
        size_t bytes_sent;
+       size_t bytes_lost;
+       size_t num_loss_events;
 };
 
 struct Client {
-       Client() {}
        Client(int sock);
 
        // Serialization/deserialization.
@@ -47,7 +50,7 @@ struct Client {
 
        // What stream we're connecting to; parsed from <request>.
        // Not relevant for READING_REQUEST.
-       std::string stream_id;
+       std::string url;
        Stream *stream;
 
        // The header we want to send. This is nominally a copy of Stream::header,
@@ -59,8 +62,16 @@ struct Client {
        // or SENDING_ERROR.
        size_t header_or_error_bytes_sent;
 
+       // Number of bytes we are into the stream (ie., the end of last send).
+       // Only relevant for SENDING_DATA.
+       size_t stream_pos;
+
        // Number of bytes we've sent of data. Only relevant for SENDING_DATA.
        size_t bytes_sent;
+
+       // Number of times we've skipped forward due to the backlog being too big,
+       // and how many bytes we've skipped over in all. Only relevant for SENDING_DATA.
+       size_t bytes_lost, num_loss_events;
 };
 
 #endif  // !defined(_CLIENT_H)