Tweak the MutexLock implementation slightly, so as to confuse Coverity less.

[cubemap] / config.h

diff --git a/config.h b/config.h
index d79d3d79de584292cf51efecd6a22d0c8917fc72..e7959c5d03a4f994f19fb8db4d75e03986a62edb 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>
@@ -19,6 +21,12 @@ struct StreamConfig {
        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 {
        int port;
 };
@@ -33,12 +41,16 @@ 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.
 };