Add support for forced prebuffering.

[cubemap] / config.cpp

diff --git a/config.cpp b/config.cpp
index 57bf10a7f0ddc038f892a4e08b62706341d98842..aa0f670a4b78a0607db4bf8af1d1232a14f21426 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <net/if.h>
 #include <sys/socket.h>
 #include <map>
 #include <string>
@@ -18,7 +19,7 @@
 
 using namespace std;
 
-#define DEFAULT_BACKLOG_SIZE 1048576
+#define DEFAULT_BACKLOG_SIZE 10485760
 
 struct ConfigLine {
        string keyword;
@@ -187,7 +188,7 @@ bool parse_port(const ConfigLine &line, Config *config)
        }
 
        AcceptorConfig acceptor;
-       acceptor.addr = CreateAnyAddress(port);
+       acceptor.addr = create_any_address(port);
 
        config->acceptors.push_back(acceptor);
        return true;
@@ -234,6 +235,13 @@ bool parse_stream(const ConfigLine &line, Config *config)
                stream.backlog_size = atoi(backlog_it->second.c_str());
        }
 
+       map<string, string>::const_iterator prebuffer_it = line.parameters.find("force_prebuffer");
+       if (prebuffer_it == line.parameters.end()) {
+               stream.prebuffering_bytes = 0;
+       } else {
+               stream.prebuffering_bytes = atoi(prebuffer_it->second.c_str());
+       }
+
        // Parse encoding.
        map<string, string>::const_iterator encoding_parm_it = line.parameters.find("encoding");
        if (encoding_parm_it == line.parameters.end() ||
@@ -298,6 +306,18 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
                udpstream.ttl = atoi(ttl_it->second.c_str());
        }
 
+       // Parse the multicast interface index.
+       map<string, string>::const_iterator multicast_iface_it = line.parameters.find("multicast_output_interface");
+       if (multicast_iface_it == line.parameters.end()) {
+               udpstream.multicast_iface_index = -1;
+       } else {
+               udpstream.multicast_iface_index = if_nametoindex(multicast_iface_it->second.c_str());
+               if (udpstream.multicast_iface_index == 0) {
+                       log(ERROR, "Interface '%s' does not exist", multicast_iface_it->second.c_str());
+                       return false;
+               }
+       }
+
        config->udpstreams.push_back(udpstream);
        return true;
 }