X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.cpp;h=6570b5b73d084531d0c7099fd1979422f56616db;hp=852ecddf1f6212bfb1efb93d050d4fc37473a673;hb=061988af511f42da3cd584b4d983177504ddc177;hpb=50651c954803c1941e6ad1bb494712891c18f7d2 diff --git a/server.cpp b/server.cpp index 852ecdd..6570b5b 100644 --- a/server.cpp +++ b/server.cpp @@ -167,7 +167,7 @@ void Server::do_work() } } -CubemapStateProto Server::serialize() +CubemapStateProto Server::serialize(unordered_map *short_response_pool) { // We don't serialize anything queued, so empty the queues. process_queued_data(); @@ -185,7 +185,7 @@ CubemapStateProto Server::serialize() CubemapStateProto serialized; for (const auto &fd_and_client : clients) { - serialized.add_clients()->MergeFrom(fd_and_client.second.serialize()); + serialized.add_clients()->MergeFrom(fd_and_client.second.serialize(short_response_pool)); } for (unique_ptr &stream : streams) { serialized.add_streams()->MergeFrom(stream->serialize()); @@ -248,7 +248,7 @@ void Server::add_client(int sock, Acceptor *acceptor) process_client(client_ptr); } -void Server::add_client_from_serialized(const ClientProto &client) +void Server::add_client_from_serialized(const ClientProto &client, const vector> &short_responses) { lock_guard lock(mu); Stream *stream; @@ -259,7 +259,7 @@ void Server::add_client_from_serialized(const ClientProto &client) } else { stream = streams[stream_index].get(); } - auto inserted = clients.insert(make_pair(client.sock(), Client(client, stream))); + auto inserted = clients.insert(make_pair(client.sock(), Client(client, short_responses, stream))); assert(inserted.second == true); // Should not already exist. Client *client_ptr = &inserted.first->second; @@ -495,8 +495,8 @@ sending_header_or_short_response_again: int ret; do { ret = write(client->sock, - 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); + 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) { @@ -515,37 +515,52 @@ sending_header_or_short_response_again: } client->header_or_short_response_bytes_sent += ret; - assert(client->header_or_short_response_bytes_sent <= client->header_or_short_response.size()); + assert(client->header_or_short_response_bytes_sent <= client->header_or_short_response->size()); - if (client->header_or_short_response_bytes_sent < client->header_or_short_response.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_short_response_again; } // We're done sending the header or error! Clear it to release some memory. - client->header_or_short_response.clear(); + client->header_or_short_response = nullptr; + client->header_or_short_response_holder.clear(); + client->header_or_short_response_ref.reset(); if (client->state == Client::SENDING_SHORT_RESPONSE) { - // We're done sending the error, so now close. - // This is postcondition #1. - close_client(client); + if (more_requests(client)) { + // We're done sending the error, but should keep on reading new requests. + goto read_request_again; + } else { + // We're done sending the error, so now close. + // This is postcondition #1. + close_client(client); + } return; } Stream *stream = client->stream; - if (client->stream_pos == size_t(-2)) { + if (client->stream_pos == Client::STREAM_POS_AT_START) { // Start sending from the beginning of the backlog. client->stream_pos = min( stream->bytes_received - stream->backlog_size, 0); client->state = Client::SENDING_DATA; goto sending_data; + } else if (client->stream_pos_end != Client::STREAM_POS_NO_END) { + // We're sending a fragment, and should have all of it, + // so start sending right away. + assert(client->stream_pos >= 0); + client->state = Client::SENDING_DATA; + 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. + assert(client->stream_pos == Client::STREAM_POS_AT_END); + assert(client->stream_pos_end == Client::STREAM_POS_NO_END); client->stream_pos = stream->bytes_received; client->state = Client::WAITING_FOR_KEYFRAME; } else { @@ -555,6 +570,8 @@ sending_header_or_short_response_again: // 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. + assert(client->stream_pos == Client::STREAM_POS_AT_END); + assert(client->stream_pos_end == Client::STREAM_POS_NO_END); deque::const_iterator starting_point_it = lower_bound(stream->suitable_starting_points.begin(), stream->suitable_starting_points.end(), @@ -606,9 +623,24 @@ sending_data: Stream *stream = client->stream; sending_data_again: - size_t bytes_to_send = stream->bytes_received - client->stream_pos; + size_t bytes_to_send; + if (client->stream_pos_end == Client::STREAM_POS_NO_END) { + bytes_to_send = stream->bytes_received - client->stream_pos; + } else { + bytes_to_send = client->stream_pos_end - client->stream_pos; + } assert(bytes_to_send <= stream->backlog_size); if (bytes_to_send == 0) { + if (client->stream_pos == client->stream_pos_end) { // We have a definite end, and we're at it. + if (more_requests(client)) { + // We're done sending the fragment, but should keep on reading new requests. + goto read_request_again; + } else { + // We're done sending the fragment, so now close. + // This is postcondition #1. + close_client(client); + } + } return; } @@ -640,13 +672,17 @@ sending_data_again: client->stream_pos += ret; client->bytes_sent += ret; - if (client->stream_pos == stream->bytes_received) { + assert(client->stream_pos_end == Client::STREAM_POS_NO_END || client->stream_pos <= client->stream_pos_end); + if (client->stream_pos == client->stream_pos_end) { + goto sending_data_again; // Will see that bytes_to_send == 0 and end. + } else if (client->stream_pos == stream->bytes_received) { // We don't have any more data for this client, so put it to sleep. // This is postcondition #3. stream->put_client_to_sleep(client); } else if (more_data && size_t(ret) == bytes_to_send) { goto sending_data_again; } + // We'll also get here for postcondition #4 (similar to the EAGAIN path above). break; } default: @@ -792,15 +828,26 @@ void Server::skip_lost_data(Client *client) size_t bytes_to_send = stream->bytes_received - client->stream_pos; if (bytes_to_send > stream->backlog_size) { size_t bytes_lost = bytes_to_send - stream->backlog_size; - client->stream_pos = stream->bytes_received - stream->backlog_size; client->bytes_lost += bytes_lost; ++client->num_loss_events; + if (!client->close_after_response) { + assert(client->stream_pos_end != Client::STREAM_POS_NO_END); + + // We've already sent a Content-length, so we can't just skip data. + // Close the connection immediately and hope the other side + // is able to figure out that there was an error and it needs to skip. + client->close_after_response = true; + client->stream_pos = client->stream_pos_end; + } else { + client->stream_pos = stream->bytes_received - stream->backlog_size; + } } } int Server::parse_request(Client *client) { vector lines = split_lines(client->request); + client->request.clear(); if (lines.empty()) { return 400; // Bad request (empty). } @@ -818,7 +865,7 @@ int Server::parse_request(Client *client) } vector request_tokens = split_tokens(lines[0]); - if (request_tokens.size() < 2) { + if (request_tokens.size() < 3) { return 400; // Bad request (empty). } if (request_tokens[0] != "GET") { @@ -828,10 +875,64 @@ int Server::parse_request(Client *client) string url = request_tokens[1]; client->url = url; if (url.size() > 8 && url.find("?backlog") == url.size() - 8) { - client->stream_pos = -2; + client->stream_pos = Client::STREAM_POS_AT_START; url = url.substr(0, url.size() - 8); } else { - client->stream_pos = -1; + size_t pos = url.find("?frag="); + if (pos != string::npos) { + // Parse an endpoint of the type /stream.mp4?frag=1234-5678. + const char *ptr = url.c_str() + pos + 6; + + // "?frag=header" is special. + if (strcmp(ptr, "header") == 0) { + client->stream_pos = Client::STREAM_POS_HEADER_ONLY; + client->stream_pos_end = -1; + } else { + char *endptr; + long long frag_start = strtol(ptr, &endptr, 10); + if (ptr == endptr || frag_start < 0 || frag_start == LLONG_MAX) { + return 400; // Bad request. + } + if (*endptr != '-') { + return 400; // Bad request. + } + ptr = endptr + 1; + + long long frag_end = strtol(ptr, &endptr, 10); + if (ptr == endptr || frag_end < frag_start || frag_end == LLONG_MAX) { + return 400; // Bad request. + } + + if (*endptr != '\0') { + return 400; // Bad request. + } + + client->stream_pos = frag_start; + client->stream_pos_end = frag_end; + } + url = url.substr(0, pos); + } else { + client->stream_pos = -1; + client->stream_pos_end = -1; + } + } + + // Figure out if we're supposed to close the socket after we've delivered the response. + string protocol = request_tokens[2]; + if (protocol.find("HTTP/") != 0) { + return 400; // Bad request. + } + client->close_after_response = false; + client->http_11 = true; + if (protocol == "HTTP/1.0") { + // No persistent connections. + client->close_after_response = true; + client->http_11 = false; + } else { + multimap::const_iterator connection_it = headers.find("Connection"); + if (connection_it != headers.end() && connection_it->second == "close") { + client->close_after_response = true; + } } map::const_iterator stream_url_map_it = stream_url_map.find(url); @@ -849,6 +950,27 @@ int Server::parse_request(Client *client) return 503; // Service unavailable. } + if (client->stream_pos_end == Client::STREAM_POS_NO_END) { + // This stream won't end, so we don't have a content-length, + // and can just as well tell the client it's Connection: close + // (otherwise, we'd have to implement chunking TE for no good reason). + client->close_after_response = true; + } else { + if (stream->encoding == Stream::STREAM_ENCODING_METACUBE) { + // This doesn't make any sense, and is hard to implement, too. + return 416; // Range not satisfiable. + } + + // Check that we have the requested fragment in our backlog. + size_t buffer_end = stream->bytes_received; + size_t buffer_start = (buffer_end <= stream->backlog_size) ? 0 : buffer_end - stream->backlog_size; + + if (client->stream_pos_end > buffer_end || + client->stream_pos < buffer_start) { + return 416; // Range not satisfiable. + } + } + 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) { @@ -863,39 +985,71 @@ int Server::parse_request(Client *client) void Server::construct_header(Client *client) { Stream *stream = client->stream; + string response = stream->http_header; + if (client->stream_pos == Client::STREAM_POS_HEADER_ONLY) { + char buf[64]; + snprintf(buf, sizeof(buf), "Content-length: %zu\r\n", stream->stream_header.size()); + response.append(buf); + } else if (client->stream_pos_end != Client::STREAM_POS_NO_END) { + char buf[64]; + snprintf(buf, sizeof(buf), "Content-length: %zu\r\n", client->stream_pos_end - client->stream_pos); + response.append(buf); + } + if (client->http_11) { + assert(response.find("HTTP/1.0") == 0); + response[7] = '1'; // Change to HTTP/1.1. + if (client->close_after_response) { + response.append("Connection: close\r\n"); + } + } else { + assert(client->close_after_response); + } if (stream->encoding == Stream::STREAM_ENCODING_RAW) { - client->header_or_short_response = stream->http_header + - "\r\n" + - stream->stream_header; + response.append("\r\n"); } else if (stream->encoding == Stream::STREAM_ENCODING_METACUBE) { - client->header_or_short_response = stream->http_header + - "Content-encoding: metacube\r\n" + - "\r\n"; + response.append("Content-encoding: metacube\r\n\r\n"); if (!stream->stream_header.empty()) { metacube2_block_header hdr; memcpy(hdr.sync, METACUBE2_SYNC, sizeof(hdr.sync)); hdr.size = htonl(stream->stream_header.size()); hdr.flags = htons(METACUBE_FLAGS_HEADER); hdr.csum = htons(metacube2_compute_crc(&hdr)); - client->header_or_short_response.append( - string(reinterpret_cast(&hdr), sizeof(hdr))); + response.append(string(reinterpret_cast(&hdr), sizeof(hdr))); } - client->header_or_short_response.append(stream->stream_header); } else { assert(false); } + if (client->stream_pos == Client::STREAM_POS_HEADER_ONLY) { + client->state = Client::SENDING_SHORT_RESPONSE; + response.append(stream->stream_header); + } else { + client->state = Client::SENDING_HEADER; + if (client->stream_pos_end == Client::STREAM_POS_NO_END) { // Fragments don't contain stream headers. + response.append(stream->stream_header); + } + } + + client->header_or_short_response_holder = move(response); + client->header_or_short_response = &client->header_or_short_response_holder; // Switch states. - client->state = Client::SENDING_HEADER; change_epoll_events(client, EPOLLOUT | EPOLLET | EPOLLRDHUP); } void Server::construct_error(Client *client, int error_code) { 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_short_response = error; + if (client->http_11 && client->close_after_response) { + snprintf(error, sizeof(error), + "HTTP/1.1 %d Error\r\nContent-type: text/plain\r\nConnection: close\r\n\r\nSomething went wrong. Sorry.\r\n", + error_code); + } else { + snprintf(error, sizeof(error), + "HTTP/1.%d %d Error\r\nContent-type: text/plain\r\nContent-length: 30\r\n\r\nSomething went wrong. Sorry.\r\n", + client->http_11, error_code); + } + client->header_or_short_response_holder = error; + client->header_or_short_response = &client->header_or_short_response_holder; // Switch states. client->state = Client::SENDING_SHORT_RESPONSE; @@ -907,19 +1061,25 @@ void Server::construct_204(Client *client) map::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"; + string response; + if (client->http_11) { + response = "HTTP/1.1 204 No Content\r\n"; + if (client->close_after_response) { + response.append("Connection: close\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; + response = "HTTP/1.0 204 No Content\r\n"; + assert(client->close_after_response); + } + if (!ping_url_map_it->second.empty()) { + response.append("Access-Control-Allow-Origin: "); + response.append(ping_url_map_it->second); + response.append("\r\n"); } + response.append("\r\n"); + + client->header_or_short_response_holder = move(response); + client->header_or_short_response = &client->header_or_short_response_holder; // Switch states. client->state = Client::SENDING_SHORT_RESPONSE; @@ -971,6 +1131,26 @@ void Server::change_epoll_events(Client *client, uint32_t events) } } +bool Server::more_requests(Client *client) +{ + if (client->close_after_response) { + return false; + } + + // Switch states and reset the parsers. We don't reset statistics. + client->state = Client::READING_REQUEST; + client->url.clear(); + client->stream = NULL; + client->header_or_short_response = nullptr; + client->header_or_short_response_holder.clear(); + client->header_or_short_response_ref.reset(); + client->header_or_short_response_bytes_sent = 0; + + change_epoll_events(client, EPOLLIN | EPOLLET | EPOLLRDHUP); // No TLS handshake, so no EPOLLOUT needed. + + return true; +} + void Server::process_queued_data() { {