Identify UDPInput error messages by the stream, too.

[cubemap] / client.h

diff --git a/client.h b/client.h
index ff07a7b2ebe629efe5951ad9f9b408bad5b669be..d511698550f2d4d5af9234f2eb0671600a72da4e 100644 (file)
--- a/client.h
+++ b/client.h
@@ -3,6 +3,7 @@
 
 // A Client represents a single connection from a client (watching a single stream).
 
 
 // A Client represents a single connection from a client (watching a single stream).
 

+#include <stddef.h>

 #include <time.h>
 #include <string>
 
 #include <time.h>
 #include <string>
 


@@ -12,9 +13,13 @@ struct Stream;
 // Digested statistics for writing to logs etc.
 struct ClientStats {
        std::string stream_id;
 // Digested statistics for writing to logs etc.
 struct ClientStats {
        std::string stream_id;

+       int sock;
+       int fwmark;

        std::string remote_addr;
        time_t connect_time;
        size_t bytes_sent;
        std::string remote_addr;
        time_t connect_time;
        size_t bytes_sent;

+       size_t bytes_lost;
+       size_t num_loss_events;

 };
 
 struct Client {
 };
 
 struct Client {


@@ -58,8 +63,16 @@ struct Client {
        // or SENDING_ERROR.
        size_t header_or_error_bytes_sent;
 
        // 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 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)
 };
 
 #endif  // !defined(_CLIENT_H)