X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.h;h=f06b9c56ef819cb1aaa7228dca1f5f5179fda680;hp=eee2e1b12e600829bde2688747b765c7fb434909;hb=f2530dbb8415f9e7cc0f2d4b45741120c95e8a05;hpb=a313e4c7a3c0c453d4dffd317fc143f1f4a7f8ba

diff --git a/config.h b/config.h
index eee2e1b..f06b9c5 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,14 +14,23 @@ 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.
+	uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
+	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.
+	uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
 };
 
 struct AcceptorConfig {
-	int port;
+	sockaddr_in6 addr;
 };
 
 struct LogConfig {
@@ -32,11 +43,17 @@ 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 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.