Release Cubemap 1.3.0.

[cubemap] / httpinput.h

diff --git a/httpinput.h b/httpinput.h
index 78c49c3df0f0cde346487698d2afdcf1b925bb5e..e7c447af52eb310da0d18b5a83cbc7272dfd5933 100644 (file)
--- a/httpinput.h
+++ b/httpinput.h
@@ -1,6 +1,7 @@
 #ifndef _HTTPINPUT_H
 #define _HTTPINPUT_H 1
 
+#include <pthread.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
@@ -11,7 +12,7 @@ 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);
@@ -58,6 +59,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;
@@ -69,9 +73,12 @@ 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;
 
@@ -87,6 +94,17 @@ private:
 
        // 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;
+
+       // If set, don't log anything related to connections.
+       // (Only set if we've had enough unsuccessful connection attempts.)
+       bool suppress_logging;
+
+       // Last time we made a connection with logging enabled.
+       // (Initially at some point before the epoch.)
+       timespec last_verbose_connection;
 };
 
 #endif  // !defined(_HTTPINPUT_H)