Fix an unneeded comparison with zero.

[cubemap] / config.cpp

diff --git a/config.cpp b/config.cpp
index 5a1fdd9ba367e13be0dec4ac4014b56624598ae1..19628ec7637e75f6f7ad07c51ccb7cdfec3902bd 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -7,15 +7,16 @@
 #include <string.h>
 #include <net/if.h>
 #include <sys/socket.h>
-#include <map>
 #include <string>
 #include <utility>
+#include <unordered_map>
 #include <vector>
 
 #include "tlse.h"
 
 #include "acceptor.h"
 #include "config.h"
+#include "input.h"
 #include "log.h"
 #include "parse.h"
 
@@ -26,7 +27,7 @@ using namespace std;
 struct ConfigLine {
        string keyword;
        vector<string> arguments;
-       map<string, string> parameters;
+       unordered_map<string, string> parameters;
 };
 
 namespace {
@@ -76,7 +77,7 @@ bool parse_hostport(const string &hostport, sockaddr_in6 *addr)
                addr->sin6_addr.s6_addr32[3] = addr4.s_addr;
        }
 
-       int port = atoi(port_string.c_str());
+       int port = stoi(port_string);
        if (port < 1 || port >= 65536) {
                log(ERROR, "port %d is out of range (must be [1,65536>).", port);
                return false;
@@ -170,7 +171,7 @@ bool fetch_config_int(const vector<ConfigLine> &config, const string &keyword, i
                        log(ERROR, "'%s' takes one argument and no parameters", keyword.c_str());
                        return false;
                }
-               *value = atoi(line.arguments[0].c_str());  // TODO: verify int validity.
+               *value = stoi(line.arguments[0]);  // TODO: verify int validity.
                return true;
        }
        return false;
@@ -211,7 +212,7 @@ bool load_file_to_string(const string &filename, size_t max_size, string *conten
        return true;
 }
 
-bool parse_tls_parameters(const map<string, string> &parameters, AcceptorConfig *acceptor)
+bool parse_tls_parameters(const unordered_map<string, string> &parameters, AcceptorConfig *acceptor)
 {
        bool has_cert = false, has_key = false;
 
@@ -281,7 +282,7 @@ bool parse_port(const ConfigLine &line, Config *config)
                return false;
        }
 
-       int port = atoi(line.arguments[0].c_str());
+       int port = stoi(line.arguments[0]);
        if (port < 1 || port >= 65536) {
                log(ERROR, "port %d is out of range (must be [1,65536>).", port);
                return false;
@@ -326,26 +327,35 @@ bool parse_stream(const ConfigLine &line, Config *config)
        stream.url = line.arguments[0];
 
        const auto src_it = line.parameters.find("src");
+       bool input_is_udp = false;
        if (src_it == line.parameters.end()) {
                log(WARNING, "stream '%s' has no src= attribute, clients will not get any data.",
                        stream.url.c_str());
        } else {
                stream.src = src_it->second;
-               // TODO: Verify that the URL is parseable?
+
+               string protocol, user, host, port, path;
+               if (!parse_url(stream.src, &protocol, &user, &host, &port, &path)) {
+                       log(ERROR, "could not parse URL '%s'", stream.src.c_str());
+                       return false;
+               }
+               if (protocol == "udp") {
+                       input_is_udp = true;
+               }
        }
 
        const auto backlog_it = line.parameters.find("backlog_size");
        if (backlog_it == line.parameters.end()) {
                stream.backlog_size = DEFAULT_BACKLOG_SIZE;
        } else {
-               stream.backlog_size = atoi(backlog_it->second.c_str());
+               stream.backlog_size = stoll(backlog_it->second);
        }
 
        const auto 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());
+               stream.prebuffering_bytes = stoll(prebuffer_it->second);
        }
 
        // Parse output encoding.
@@ -362,13 +372,18 @@ bool parse_stream(const ConfigLine &line, Config *config)
 
        // Parse input encoding.
        const auto src_encoding_parm_it = line.parameters.find("src_encoding");
-       if (src_encoding_parm_it == line.parameters.end() ||
-           src_encoding_parm_it->second == "metacube") {
+       if (src_encoding_parm_it == line.parameters.end()) {
+               stream.src_encoding = input_is_udp ? StreamConfig::STREAM_ENCODING_RAW : StreamConfig::STREAM_ENCODING_METACUBE;
+       } else if (src_encoding_parm_it->second == "metacube") {
+               if (input_is_udp) {
+                       log(ERROR, "UDP streams cannot have Metacube input");
+                       return false;
+               }
                stream.src_encoding = StreamConfig::STREAM_ENCODING_METACUBE;
        } else if (src_encoding_parm_it->second == "raw") {
                stream.src_encoding = StreamConfig::STREAM_ENCODING_RAW;
        } else {
-               log(ERROR, "Parameter 'src_encoding' must be either 'raw' or 'metacube' (default)");
+               log(ERROR, "Parameter 'src_encoding' must be either 'raw' (default for UDP) or 'metacube' (default for HTTP)");
                return false;
        }
 
@@ -377,7 +392,7 @@ bool parse_stream(const ConfigLine &line, Config *config)
        if (pacing_rate_it == line.parameters.end()) {
                stream.pacing_rate = ~0U;
        } else {
-               stream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
+               stream.pacing_rate = stoll(pacing_rate_it->second.c_str()) * 1024 / 8;
        }
 
        // Parse the HLS URL, if any.
@@ -416,7 +431,7 @@ bool parse_stream(const ConfigLine &line, Config *config)
                        return false;
                }
                stream.hls_backlog_margin = stoi(hls_backlog_margin_it->second);
-               if (stream.hls_backlog_margin < 0 || stream.hls_backlog_margin >= stream.backlog_size) {
+               if (stream.hls_backlog_margin >= stream.backlog_size) {
                        log(ERROR, "'hls_backlog_margin' must be nonnegative, but less than the backlog size");
                        return false;
                }
@@ -461,7 +476,7 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
        if (pacing_rate_it == line.parameters.end()) {
                udpstream.pacing_rate = ~0U;
        } else {
-               udpstream.pacing_rate = atoi(pacing_rate_it->second.c_str()) * 1024 / 8;
+               udpstream.pacing_rate = stoi(pacing_rate_it->second) * 1024 / 8;
        }
 
        // Parse the TTL. The same value is used for unicast and multicast.
@@ -469,7 +484,7 @@ bool parse_udpstream(const ConfigLine &line, Config *config)
        if (ttl_it == line.parameters.end()) {
                udpstream.ttl = -1;
        } else {
-               udpstream.ttl = atoi(ttl_it->second.c_str());
+               udpstream.ttl = stoi(ttl_it->second);
        }
 
        // Parse the multicast interface index.