X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=client.h;h=cd909e39e0032cc4fa23e317e389fdc1bb96f2da;hp=db1fea51c69ae090f8a1d70db7b75aaf6f31f62d;hb=46115862ece2cbd590bc4ae6fe06767869fa7668;hpb=a0949bd6af9a604e7073354fc530353bbdb7871c diff --git a/client.h b/client.h index db1fea5..cd909e3 100644 --- a/client.h +++ b/client.h @@ -12,7 +12,9 @@ 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; @@ -21,7 +23,6 @@ struct ClientStats { }; struct Client { - Client() {} Client(int sock); // Serialization/deserialization. @@ -49,7 +50,7 @@ struct Client { // What stream we're connecting to; parsed from . // 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, @@ -62,7 +63,10 @@ struct Client { 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. + // -1 means we want to send from the end of the backlog (the normal case), + // -2 means we want to send from the _beginning_ of the backlog. + // Once we go into SENDING_DATA, these negative values will be translated + // to real numbers. size_t stream_pos; // Number of bytes we've sent of data. Only relevant for SENDING_DATA.