}
timeout_time.tv_sec -= REQUEST_READ_TIMEOUT_SEC;
while (!clients_ordered_by_connect_time.empty()) {
- pair<timespec, int> &connect_time_and_fd = clients_ordered_by_connect_time.front();
+ const pair<timespec, int> &connect_time_and_fd = clients_ordered_by_connect_time.front();
// See if we have reached the end of clients to process.
if (is_earlier(timeout_time, connect_time_and_fd.first)) {
// If this client doesn't exist anymore, just ignore it
// (it was deleted earlier).
- std::map<int, Client>::iterator client_it = clients.find(connect_time_and_fd.second);
+ map<int, Client>::iterator client_it = clients.find(connect_time_and_fd.second);
if (client_it == clients.end()) {
clients_ordered_by_connect_time.pop();
continue;
}
}
-int Server::lookup_stream_by_url(const std::string &url) const
+int Server::lookup_stream_by_url(const string &url) const
{
- map<string, int>::const_iterator url_it = url_map.find(url);
- if (url_it == url_map.end()) {
+ map<string, int>::const_iterator stream_url_it = stream_url_map.find(url);
+ if (stream_url_it == stream_url_map.end()) {
return -1;
}
- return url_it->second;
+ return stream_url_it->second;
}
-int Server::add_stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding)
+int Server::add_stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Stream::Encoding encoding, Stream::Encoding src_encoding)
{
MutexLock lock(&mutex);
- url_map.insert(make_pair(url, streams.size()));
- streams.push_back(new Stream(url, backlog_size, prebuffering_bytes, encoding));
+ stream_url_map.insert(make_pair(url, streams.size()));
+ streams.push_back(new Stream(url, backlog_size, prebuffering_bytes, encoding, src_encoding));
return streams.size() - 1;
}
int Server::add_stream_from_serialized(const StreamProto &stream, int data_fd)
{
MutexLock lock(&mutex);
- url_map.insert(make_pair(stream.url(), streams.size()));
+ stream_url_map.insert(make_pair(stream.url(), streams.size()));
streams.push_back(new Stream(stream, data_fd));
return streams.size() - 1;
}
assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
streams[stream_index]->encoding = encoding;
}
+
+void Server::set_src_encoding(int stream_index, Stream::Encoding encoding)
+{
+ MutexLock lock(&mutex);
+ assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
+ streams[stream_index]->src_encoding = encoding;
+}
void Server::set_header(int stream_index, const string &http_header, const string &stream_header)
{
MutexLock lock(&mutex);
assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
streams[stream_index]->http_header = http_header;
+
+ if (stream_header != streams[stream_index]->stream_header) {
+ // We cannot start at any of the older starting points anymore,
+ // since they'd get the wrong header for the stream (not to mention
+ // that a changed header probably means the stream restarted,
+ // which means any client starting on the old one would probably
+ // stop playing properly at the change point). Next block
+ // should be a suitable starting point (if not, something is
+ // pretty strange), so it will fill up again soon enough.
+ streams[stream_index]->suitable_starting_points.clear();
+ }
streams[stream_index]->stream_header = stream_header;
- // FIXME: We should reset last_suitable_starting_point at this point.
}
void Server::set_pacing_rate(int stream_index, uint32_t pacing_rate)
streams[stream_index]->pacing_rate = pacing_rate;
}
-void Server::add_data_deferred(int stream_index, const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start)
+void Server::add_gen204(const std::string &url, const std::string &allow_origin)
+{
+ MutexLock lock(&mutex);
+ assert(clients.empty());
+ ping_url_map[url] = allow_origin;
+}
+
+void Server::add_data_deferred(int stream_index, const char *data, size_t bytes, uint16_t metacube_flags)
{
assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
- streams[stream_index]->add_data_deferred(data, bytes, suitable_for_stream_start);
+ streams[stream_index]->add_data_deferred(data, bytes, metacube_flags);
}
// See the .h file for postconditions after this function.
int error_code = parse_request(client);
if (error_code == 200) {
construct_header(client);
+ } else if (error_code == 204) {
+ construct_204(client);
} else {
construct_error(client, error_code);
}
// We've changed states, so fall through.
- assert(client->state == Client::SENDING_ERROR ||
+ assert(client->state == Client::SENDING_SHORT_RESPONSE ||
client->state == Client::SENDING_HEADER);
}
- case Client::SENDING_ERROR:
+ case Client::SENDING_SHORT_RESPONSE:
case Client::SENDING_HEADER: {
-sending_header_or_error_again:
+sending_header_or_short_response_again:
int ret;
do {
ret = write(client->sock,
- client->header_or_error.data() + client->header_or_error_bytes_sent,
- client->header_or_error.size() - client->header_or_error_bytes_sent);
+ client->header_or_short_response.data() + client->header_or_short_response_bytes_sent,
+ client->header_or_short_response.size() - client->header_or_short_response_bytes_sent);
} while (ret == -1 && errno == EINTR);
if (ret == -1 && errno == EAGAIN) {
return;
}
- client->header_or_error_bytes_sent += ret;
- assert(client->header_or_error_bytes_sent <= client->header_or_error.size());
+ client->header_or_short_response_bytes_sent += ret;
+ assert(client->header_or_short_response_bytes_sent <= client->header_or_short_response.size());
- if (client->header_or_error_bytes_sent < client->header_or_error.size()) {
+ if (client->header_or_short_response_bytes_sent < client->header_or_short_response.size()) {
// We haven't sent all yet. Fine; go another round.
- goto sending_header_or_error_again;
+ goto sending_header_or_short_response_again;
}
// We're done sending the header or error! Clear it to release some memory.
- client->header_or_error.clear();
+ client->header_or_short_response.clear();
- if (client->state == Client::SENDING_ERROR) {
+ if (client->state == Client::SENDING_SHORT_RESPONSE) {
// We're done sending the error, so now close.
// This is postcondition #1.
close_client(client);
return;
}
- // Start sending from the first keyframe we get. In other
- // words, we won't send any of the backlog, but we'll start
- // sending immediately as we get the next keyframe block.
- // This is postcondition #3.
+ Stream *stream = client->stream;
if (client->stream_pos == size_t(-2)) {
- client->stream_pos = std::min<size_t>(
- client->stream->bytes_received - client->stream->backlog_size,
+ // Start sending from the beginning of the backlog.
+ client->stream_pos = min<size_t>(
+ stream->bytes_received - stream->backlog_size,
0);
client->state = Client::SENDING_DATA;
- } else {
- // client->stream_pos should be -1, but it might not be,
- // if we have clients from an older version.
- client->stream_pos = client->stream->bytes_received;
+ goto sending_data;
+ } else if (stream->prebuffering_bytes == 0) {
+ // Start sending from the first keyframe we get. In other
+ // words, we won't send any of the backlog, but we'll start
+ // sending immediately as we get the next keyframe block.
+ // Note that this is functionally identical to the next if branch,
+ // except that we save a binary search.
+ client->stream_pos = stream->bytes_received;
client->state = Client::WAITING_FOR_KEYFRAME;
+ } else {
+ // We're not going to send anything to the client before we have
+ // N bytes. However, this wait might be boring; we can just as well
+ // use it to send older data if we have it. We use lower_bound()
+ // so that we are conservative and never add extra latency over just
+ // waiting (assuming CBR or nearly so); otherwise, we could want e.g.
+ // 100 kB prebuffer but end up sending a 10 MB GOP.
+ deque<size_t>::const_iterator starting_point_it =
+ lower_bound(stream->suitable_starting_points.begin(),
+ stream->suitable_starting_points.end(),
+ stream->bytes_received - stream->prebuffering_bytes);
+ if (starting_point_it == stream->suitable_starting_points.end()) {
+ // None found. Just put us at the end, and then wait for the
+ // first keyframe to appear.
+ client->stream_pos = stream->bytes_received;
+ client->state = Client::WAITING_FOR_KEYFRAME;
+ } else {
+ client->stream_pos = *starting_point_it;
+ client->state = Client::PREBUFFERING;
+ goto prebuffering;
+ }
}
- client->stream->put_client_to_sleep(client);
- return;
+ // Fall through.
}
case Client::WAITING_FOR_KEYFRAME: {
Stream *stream = client->stream;
- if (ssize_t(client->stream_pos) > stream->last_suitable_starting_point) {
+ if (stream->suitable_starting_points.empty() ||
+ client->stream_pos > stream->suitable_starting_points.back()) {
// We haven't received a keyframe since this stream started waiting,
// so keep on waiting for one.
// This is postcondition #3.
stream->put_client_to_sleep(client);
return;
}
- client->stream_pos = stream->last_suitable_starting_point;
+ client->stream_pos = stream->suitable_starting_points.back();
client->state = Client::PREBUFFERING;
// Fall through.
}
case Client::PREBUFFERING: {
+prebuffering:
Stream *stream = client->stream;
size_t bytes_to_send = stream->bytes_received - client->stream_pos;
assert(bytes_to_send <= stream->backlog_size);
// Fall through.
}
case Client::SENDING_DATA: {
+sending_data:
skip_lost_data(client);
Stream *stream = client->stream;
}
string url = request_tokens[1];
+ client->url = url;
if (url.find("?backlog") == url.size() - 8) {
client->stream_pos = -2;
url = url.substr(0, url.size() - 8);
client->stream_pos = -1;
}
- map<string, int>::const_iterator url_map_it = url_map.find(url);
- if (url_map_it == url_map.end()) {
- return 404; // Not found.
+ map<string, int>::const_iterator stream_url_map_it = stream_url_map.find(url);
+ if (stream_url_map_it == stream_url_map.end()) {
+ map<string, string>::const_iterator ping_url_map_it = ping_url_map.find(url);
+ if (ping_url_map_it == ping_url_map.end()) {
+ return 404; // Not found.
+ } else {
+ return 204; // No error.
+ }
}
- Stream *stream = streams[url_map_it->second];
+ Stream *stream = streams[stream_url_map_it->second];
if (stream->http_header.empty()) {
return 503; // Service unavailable.
}
- client->url = request_tokens[1];
-
client->stream = stream;
if (setsockopt(client->sock, SOL_SOCKET, SO_MAX_PACING_RATE, &client->stream->pacing_rate, sizeof(client->stream->pacing_rate)) == -1) {
if (client->stream->pacing_rate != ~0U) {
{
Stream *stream = client->stream;
if (stream->encoding == Stream::STREAM_ENCODING_RAW) {
- client->header_or_error = stream->http_header +
+ client->header_or_short_response = stream->http_header +
"\r\n" +
stream->stream_header;
} else if (stream->encoding == Stream::STREAM_ENCODING_METACUBE) {
- client->header_or_error = stream->http_header +
+ client->header_or_short_response = stream->http_header +
"Content-encoding: metacube\r\n" +
"\r\n";
if (!stream->stream_header.empty()) {
hdr.size = htonl(stream->stream_header.size());
hdr.flags = htons(METACUBE_FLAGS_HEADER);
hdr.csum = htons(metacube2_compute_crc(&hdr));
- client->header_or_error.append(
+ client->header_or_short_response.append(
string(reinterpret_cast<char *>(&hdr), sizeof(hdr)));
}
- client->header_or_error.append(stream->stream_header);
+ client->header_or_short_response.append(stream->stream_header);
} else {
assert(false);
}
char error[256];
snprintf(error, 256, "HTTP/1.0 %d Error\r\nContent-type: text/plain\r\n\r\nSomething went wrong. Sorry.\r\n",
error_code);
- client->header_or_error = error;
+ client->header_or_short_response = error;
+
+ // Switch states.
+ client->state = Client::SENDING_SHORT_RESPONSE;
+
+ epoll_event ev;
+ ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP;
+ ev.data.u64 = reinterpret_cast<uint64_t>(client);
+
+ if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
+ log_perror("epoll_ctl(EPOLL_CTL_MOD)");
+ exit(1);
+ }
+}
+
+void Server::construct_204(Client *client)
+{
+ map<string, string>::const_iterator ping_url_map_it = ping_url_map.find(client->url);
+ assert(ping_url_map_it != ping_url_map.end());
+
+ if (ping_url_map_it->second.empty()) {
+ client->header_or_short_response =
+ "HTTP/1.0 204 No Content\r\n"
+ "\r\n";
+ } else {
+ char response[256];
+ snprintf(response, 256,
+ "HTTP/1.0 204 No Content\r\n"
+ "Access-Control-Allow-Origin: %s\r\n"
+ "\r\n",
+ ping_url_map_it->second.c_str());
+ client->header_or_short_response = response;
+ }
// Switch states.
- client->state = Client::SENDING_ERROR;
+ client->state = Client::SENDING_SHORT_RESPONSE;
epoll_event ev;
ev.events = EPOLLOUT | EPOLLET | EPOLLRDHUP;