X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.h;h=d5b04113303d2cf026a21b823d97e385e02eb540;hp=e7959c5d03a4f994f19fb8db4d75e03986a62edb;hb=b08dc2a81825a298a03f2dee2ae7dd7045e72739;hpb=bd694fdd3dd1417399aecead2c8b91fc4fe95ce8

diff --git a/config.h b/config.h
index e7959c5..d5b0411 100644
--- a/config.h
+++ b/config.h
@@ -9,26 +9,23 @@
 #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;
-	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).
+	int ttl;  // Default is -1 (use operating system default).
 };
 
 struct AcceptorConfig {
-	int port;
+	sockaddr_in6 addr;
 };
 
 struct LogConfig {
@@ -39,7 +36,6 @@ 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;