X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.h;h=cf3fdfbfb189d9d936e83c9cc2860decc9450937;hp=bed0551c3e3de4709963dc0fa305b3143dfd7362;hb=845934ca50eee40884e8cc85ea81eb310efa5ca3;hpb=3ce04a3c410c5836394417b19e70f2a95bc8a5e7

diff --git a/config.h b/config.h
index bed0551..cf3fdfb 100644
--- 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 {
@@ -28,14 +37,18 @@ struct LogConfig {
 };
 
 struct Config {
+	bool daemonize;
 	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.