{
FILE *fp = fopen(filename.c_str(), "r");
if (fp == NULL) {
- perror(filename.c_str());
+ log_perror(filename.c_str());
return false;
}
}
StreamConfig stream;
- stream.stream_id = line.arguments[0];
+ stream.url = line.arguments[0];
map<string, string>::const_iterator src_it = line.parameters.find("src");
if (src_it == line.parameters.end()) {
log(WARNING, "stream '%s' has no src= attribute, clients will not get any data.",
- stream.stream_id.c_str());
+ stream.url.c_str());
} else {
stream.src = src_it->second;
// TODO: Verify that the URL is parseable?
stream.backlog_size = atoi(backlog_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() ||
+ encoding_parm_it->second == "raw") {
+ stream.encoding = StreamConfig::STREAM_ENCODING_RAW;
+ } else if (encoding_parm_it->second == "metacube") {
+ stream.encoding = StreamConfig::STREAM_ENCODING_METACUBE;
+ } else {
+ log(ERROR, "Parameter 'encoding' must be either 'raw' (default) or 'metacube'");
+ return false;
+ }
+
// Parse marks, if so desired.
map<string, string>::const_iterator mark_parm_it = line.parameters.find("mark");
if (mark_parm_it == line.parameters.end()) {
return true;
}
+bool parse_udpstream(const ConfigLine &line, Config *config)
+{
+ if (line.arguments.size() != 1) {
+ log(ERROR, "'udpstream' takes exactly one argument");
+ return false;
+ }
+
+ UDPStreamConfig udpstream;
+
+ string hostport = line.arguments[0];
+
+ // See if the argument if on the type [ipv6addr]:port.
+ if (!hostport.empty() && hostport[0] == '[') {
+ size_t split = hostport.find("]:");
+ if (split == string::npos) {
+ log(ERROR, "udpstream destination '%s' is malformed; must be either [ipv6addr]:port or ipv4addr:port");
+ return false;
+ }
+
+ string host(hostport.begin() + 1, hostport.begin() + split);
+ string port = hostport.substr(split + 2);
+
+ udpstream.dst.sin6_family = AF_INET6;
+ if (inet_pton(AF_INET6, host.c_str(), &udpstream.dst.sin6_addr) != 1) {
+ log(ERROR, "udpstream destination host '%s' is not a valid IPv6 address");
+ return false;
+ }
+
+ udpstream.dst.sin6_port = htons(atoi(port.c_str())); // TODO: Verify validity.
+ } else {
+ // OK, then it must be ipv4addr:port.
+ size_t split = hostport.find(":");
+ if (split == string::npos) {
+ log(ERROR, "udpstream destination '%s' is malformed; must be either [ipv6addr]:port or ipv4addr:port");
+ return false;
+ }
+
+ string host(hostport.begin(), hostport.begin() + split);
+ string port = hostport.substr(split + 1);
+
+ // Parse to an IPv4 address, then construct a mapped-v4 address from that.
+ in_addr addr4;
+
+ if (inet_pton(AF_INET, host.c_str(), &addr4) != 1) {
+ log(ERROR, "udpstream destination host '%s' is not a valid IPv4 address");
+ return false;
+ }
+
+ udpstream.dst.sin6_family = AF_INET6;
+ udpstream.dst.sin6_addr.s6_addr32[0] = 0;
+ udpstream.dst.sin6_addr.s6_addr32[1] = 0;
+ udpstream.dst.sin6_addr.s6_addr32[2] = htonl(0xffff);
+ udpstream.dst.sin6_addr.s6_addr32[3] = addr4.s_addr;
+ udpstream.dst.sin6_port = htons(atoi(port.c_str())); // TODO: Verify validity.
+ }
+
+ map<string, string>::const_iterator src_it = line.parameters.find("src");
+ if (src_it == line.parameters.end()) {
+ // This is pretty meaningless, but OK, consistency is good.
+ log(WARNING, "udpstream to %s has no src= attribute, clients will not get any data.",
+ hostport.c_str());
+ } else {
+ udpstream.src = src_it->second;
+ // TODO: Verify that the URL is parseable?
+ }
+
+ // Parse marks, if so desired.
+ map<string, string>::const_iterator mark_parm_it = line.parameters.find("mark");
+ if (mark_parm_it == line.parameters.end()) {
+ udpstream.mark_pool = -1;
+ } else {
+ int from, to;
+ if (!parse_mark_pool(mark_parm_it->second, &from, &to)) {
+ return false;
+ }
+ udpstream.mark_pool = allocate_mark_pool(from, to, config);
+ }
+
+ config->udpstreams.push_back(udpstream);
+ return true;
+}
bool parse_error_log(const ConfigLine &line, Config *config)
{
if (line.arguments.size() != 0) {
return false;
}
+ config->daemonize = false;
+
if (!fetch_config_int(lines, "num_servers", &config->num_servers)) {
log(ERROR, "Missing 'num_servers' statement in config file.");
return false;
if (has_stats_interval && !has_stats_file) {
log(WARNING, "'stats_interval' given, but no 'stats_file'. No statistics will be written.");
}
+
+ fetch_config_string(lines, "access_log", &config->access_log_file);
for (size_t i = 0; i < lines.size(); ++i) {
const ConfigLine &line = lines[i];
if (line.keyword == "num_servers" ||
line.keyword == "stats_file" ||
- line.keyword == "stats_interval") {
+ line.keyword == "stats_interval" ||
+ line.keyword == "access_log") {
// Already taken care of, above.
} else if (line.keyword == "port") {
if (!parse_port(line, config)) {
if (!parse_stream(line, config)) {
return false;
}
+ } else if (line.keyword == "udpstream") {
+ if (!parse_udpstream(line, config)) {
+ return false;
+ }
} else if (line.keyword == "error_log") {
if (!parse_error_log(line, config)) {
return false;
}
+ } else if (line.keyword == "daemonize") {
+ config->daemonize = true;
} else {
log(ERROR, "Unknown configuration keyword '%s'.",
line.keyword.c_str());
projects / cubemap / blobdiff