X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.h;h=a230731cee52b3a89566ec3f2df143439f258d97;hp=d45ab08316b318c3e717d6c4a37252f047b0a9c5;hb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd;hpb=2c6cd9718a5baf5a2ed5be73ec3c525d4873f45a

diff --git a/config.h b/config.h
index d45ab08..a230731 100644
--- a/config.h
+++ b/config.h
@@ -3,31 +3,62 @@
 
 // Various routines that deal with parsing the configuration file.
 
-#include <vector>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <stddef.h>
 #include <string>
+#include <vector>
 
-struct MarkPoolConfig {
-	int from, to;
+struct StreamConfig {
+	std::string url;  // As seen by the client.
+	std::string src;  // Can be empty.
+	size_t backlog_size;
+	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;
 };
 
-struct StreamConfig {
-	std::string stream_id;
+struct UDPStreamConfig {
+	sockaddr_in6 dst;
 	std::string src;  // Can be empty.
-	int mark_pool;  // -1 for none.
+	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).
+	StreamConfig::Encoding src_encoding;
+};
+
+struct Gen204Config {
+	std::string url;  // As seen by the client.
+	std::string allow_origin;  // Can be empty.
 };
 
 struct AcceptorConfig {
-	int port;
+	sockaddr_in6 addr;
+};
+
+struct LogConfig {
+	enum { LOG_TYPE_FILE, LOG_TYPE_CONSOLE, LOG_TYPE_SYSLOG } type;
+	std::string filename;
 };
 
 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.