Use in-class initialization for making it harder to forget to set a default.

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index bf7d9534d6eeced4d06319f982981f450c197745..ac52bfc34b019e91fa58dc688306d872695ca7f8 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,17 +1,19 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
+#include <pthread.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
 
 #include "input.h"
+#include "metacube2.h"
 
 class InputProto;
 
 class HTTPInput : public Input {
 public:
-       HTTPInput(const std::string &url);
+       HTTPInput(const std::string &url, Input::Encoding encoding);
 
        // Serialization/deserialization.
        HTTPInput(const InputProto &serialized);
@@ -21,10 +23,7 @@ public:
 
        virtual std::string get_url() const { return url; }
 
-       virtual void add_destination(int stream_index)
-       {
-               stream_indices.push_back(stream_index);
-       }
+       virtual void add_destination(int stream_index);
 
        virtual InputStats get_stats() const;
 
@@ -46,6 +45,8 @@ private:
        // and outputs a warning.
        void drop_pending_data(size_t num_bytes);
 
+       void process_metacube_metadata_block(const metacube2_block_header &hdr, const char *payload, uint32_t payload_size);
+
        enum State {
                NOT_CONNECTED,
                SENDING_REQUEST,
@@ -61,6 +62,9 @@ private:
        std::string url;
        std::string host, port, path;
 
+       // What the input stream is to be interpreted as (normally Metacube).
+       Input::Encoding encoding;
+
        // The HTTP request, with headers and all.
        // Only relevant for SENDING_REQUEST.
        std::string request;
@@ -72,24 +76,38 @@ private:
        // The HTTP response we've received so far. Only relevant for RECEIVING_HEADER.
        std::string response;
 
-       // The HTTP respones headers we want to give clients for this input.
+       // The HTTP response headers we want to give clients for this input.
        std::string http_header;
 
+       // The stream heder we want to give clients for this input.
+       std::string stream_header;
+
        // Data we have received but not fully processed yet.
        std::vector<char> pending_data;
 
        // If <pending_data> starts with a Metacube header,
        // this is true.
-       bool has_metacube_header;
+       bool has_metacube_header = false;
 
        // The socket we are downloading on (or -1).
-       int sock;
+       int sock = -1;
 
        // Mutex protecting <stats>.
        mutable pthread_mutex_t stats_mutex;
 
        // The current statistics for this connection. Protected by <stats_mutex>.
        InputStats stats;
+
+       // Number of (started) connection attempts since last data byte was successfully read.
+       unsigned num_connection_attempts = 0;
+
+       // If set, don't log anything related to connections.
+       // (Only set if we've had enough unsuccessful connection attempts.)
+       bool suppress_logging = false;
+
+       // Last time we made a connection with logging enabled.
+       // (Initially at some point before the epoch.)
+       timespec last_verbose_connection { -3600, 0 };
 };
 
 #endif  // !defined(_HTTPINPUT_H)