Fix a GCC warning.

[cubemap] / config.h

diff --git a/config.h b/config.h
index eee2e1b12e600829bde2688747b765c7fb434909..b5461cceae1f0978cce52d53a82de1b2cca95655 100644 (file)
--- a/config.h
+++ b/config.h
@@ -3,23 +3,46 @@
 
 // Various routines that deal with parsing the configuration file.
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
 
-struct MarkPoolConfig {
-       int from, to;
-};
-
 struct StreamConfig {
-       std::string stream_id;
+       std::string url;  // As seen by the client.
+       std::string hls_url;  // As seen by the client. Can be empty.
        std::string src;  // Can be empty.
        size_t backlog_size;
-       int mark_pool;  // -1 for none.
+       size_t prebuffering_bytes;
+       uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
+       enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
+       Encoding encoding;
+       Encoding src_encoding;
+       std::string allow_origin;
+
+       // These only matter if hls_url is nonempty.
+       int hls_frag_duration = 6;  // Apple recommendation (“HLS Authoring Specification for Apple Devices”, point 7.5).
+       size_t hls_backlog_margin = 0;
+};
+
+struct UDPStreamConfig {
+       sockaddr_in6 dst;
+       std::string src;  // Can be empty.
+       uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
+       int ttl;  // Default is -1 (use operating system default).
+       int multicast_iface_index;  // Default is -1 (use operating system default).
+};
+
+struct Gen204Config {
+       std::string url;  // As seen by the client.
+       std::string allow_origin;  // Can be empty.
 };
 
 struct AcceptorConfig {
-       int port;
+       sockaddr_in6 addr;
+
+       std::string certificate_chain, private_key;  // In PEM format.
 };
 
 struct LogConfig {
@@ -30,13 +53,19 @@ struct LogConfig {
 struct Config {
        bool daemonize;
        int num_servers;
-       std::vector<MarkPoolConfig> mark_pools;
        std::vector<StreamConfig> streams;
+       std::vector<UDPStreamConfig> udpstreams;
+       std::vector<Gen204Config> pings;
        std::vector<AcceptorConfig> acceptors;
        std::vector<LogConfig> log_destinations;
 
        std::string stats_file;  // Empty means no stats file.
        int stats_interval;
+
+       std::string input_stats_file;  // Empty means no input stats file.
+       int input_stats_interval;
+
+       std::string access_log_file;  // Empty means no accses_log file.
 };
 
 // Parse and validate configuration. Returns false on error.