Fix timeout behavior with persistent connections.

[cubemap] / client.h

diff --git a/client.h b/client.h
index 8f9f682e268e291935278f91cedda3257dc1bae5..858197fdcc457dd19a73d5ffb66af50bff5cf5f2 100644 (file)
--- a/client.h
+++ b/client.h
@@ -42,7 +42,7 @@ struct Client {
        // The file descriptor associated with this socket.
        int sock;
 
-       // When the client connected, in terms of CLOCK_MONOTONIC_COARSE.
+       // When the client connected (or went into keepalive), in terms of CLOCK_MONOTONIC_COARSE.
        timespec connect_time;
 
        // Some information only used for logging.
@@ -62,6 +62,9 @@ struct Client {
        std::string url;
        Stream *stream = nullptr;
 
+       // If true, we don't actually serve the stream, but its HLS playlist.
+       bool serving_hls_playlist = false;
+
        // Whether we should close the connection after sending the response.
        // Not relevant for READING_REQUEST. Must be true if http_11 is false.
        bool close_after_response;
@@ -101,25 +104,25 @@ struct Client {
        // although only at a keyframe.
        // -2 means we want to send from the _beginning_ of the backlog.
        // -3 means we sent the header only.
-       static const size_t STREAM_POS_AT_END = -1;
-       static const size_t STREAM_POS_AT_START = -2;
-       static const size_t STREAM_POS_HEADER_ONLY = -3;
+       static const uint64_t STREAM_POS_AT_END = -1;
+       static const uint64_t STREAM_POS_AT_START = -2;
+       static const uint64_t STREAM_POS_HEADER_ONLY = -3;
 
        // Once we go into WAITING_FOR_KEYFRAME, PREBUFFERING or SENDING_DATA,
        // these negative values will be translated to real numbers.
-       size_t stream_pos = 0;
+       uint64_t stream_pos = 0;
 
        // Position at which to end the stream (one-past-the-end, used for fragments).
        // -1 means never to end; this is the common case.
-       static const size_t STREAM_POS_NO_END = -1;
-       size_t stream_pos_end = 0;
+       static const uint64_t STREAM_POS_NO_END = -1;
+       uint64_t stream_pos_end = 0;
 
        // Number of bytes we've sent of data. Only relevant for SENDING_DATA.
-       size_t bytes_sent = 0;
+       uint64_t bytes_sent = 0;
 
        // 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 = 0, num_loss_events = 0;
+       uint64_t bytes_lost = 0, num_loss_events = 0;
 
        TLSContext *tls_context = nullptr;
        const unsigned char *tls_data_to_send = nullptr;