Run include-what-you-use.

[cubemap] / config.h

diff --git a/config.h b/config.h
index eee2e1b12e600829bde2688747b765c7fb434909..cf3fdfbfb189d9d936e83c9cc2860decc9450937 100644 (file)
--- a/config.h
+++ b/config.h
@@ -3,6 +3,8 @@
 
 // Various routines that deal with parsing the configuration file.
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <stddef.h>
 #include <string>
 #include <vector>
@@ -12,10 +14,17 @@ struct MarkPoolConfig {
 };
 
 struct StreamConfig {
-       std::string stream_id;
+       std::string url;  // As seen by the client.
        std::string src;  // Can be empty.
        size_t backlog_size;
        int mark_pool;  // -1 for none.
+       enum { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE } encoding;
+};
+
+struct UDPStreamConfig {
+       sockaddr_in6 dst;
+       std::string src;  // Can be empty.
+       int mark_pool;  // -1 for none.
 };
 
 struct AcceptorConfig {
@@ -32,11 +41,14 @@ struct Config {
        int num_servers;
        std::vector<MarkPoolConfig> mark_pools;
        std::vector<StreamConfig> streams;
+       std::vector<UDPStreamConfig> udpstreams;
        std::vector<AcceptorConfig> acceptors;
        std::vector<LogConfig> log_destinations;
 
        std::string stats_file;  // Empty means no stats file.
        int stats_interval;
+
+       std::string access_log_file;  // Empty means no accses_log file.
 };
 
 // Parse and validate configuration. Returns false on error.