Add ?frag=header for getting a HLS fragment of the header only (useful for fMP4).

[cubemap] / client.h

diff --git a/client.h b/client.h
index 834ddad9cd2227e7b302674d33e67d49783ca1f1..e558bd0e4e8fa47454bbb7d87bf2802a00973431 100644 (file)
--- a/client.h
+++ b/client.h
@@ -58,11 +58,21 @@ struct Client {
        std::string url;
        Stream *stream = nullptr;
 
+       // 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;
+
+       // Whether the request came in over HTTP/1.1 or higher.
+       bool http_11;
+
        // The header we want to send, or the response with headers if we know
        // it in its entirety after reading the request (typically an error).
        // This is nominally a copy of Stream::header, but since that might
        // change on reconnects etc., we keep a local copy here. Only relevant
        // for SENDING_HEADER or SENDING_SHORT_RESPONSE; blank otherwise.
+       //
+       // Must start with the string "HTTP/1.0 ", which will be changed to 1.1
+       // if relevant.
        std::string header_or_short_response;
 
        // Number of bytes we've sent of the header. Only relevant for SENDING_HEADER
@@ -73,10 +83,20 @@ struct Client {
        // -1 means we want to send from the end of the backlog (the normal case),
        // 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;
+
        // 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;
 
+       // 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;
+
        // Number of bytes we've sent of data. Only relevant for SENDING_DATA.
        size_t bytes_sent = 0;