#include <assert.h>
#include <errno.h>
+#include <fcntl.h>
+#include <math.h>
#include <netdb.h>
#include <netinet/in.h>
#include <poll.h>
has_metacube_header(serialized.has_metacube_header()),
sock(serialized.sock())
{
+ // Set back the close-on-exec flag for the socket.
+ // (This can't leak into a child, since we haven't been started yet.)
+ fcntl(sock, F_SETFD, 1);
+
pending_data.resize(serialized.pending_data().size());
memcpy(&pending_data[0], serialized.pending_data().data(), serialized.pending_data().size());
InputProto HTTPInput::serialize() const
{
+ // Unset the close-on-exec flag for the socket.
+ // (This can't leak into a child, since there's only one thread left.)
+ fcntl(sock, F_SETFD, 0);
+
InputProto serialized;
serialized.set_state(state);
serialized.set_url(url);
// Connect to everything in turn until we have a socket.
for ( ; ai && !should_stop(); ai = ai->ai_next) {
- int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ // Now do a non-blocking connect. This is important because we want to be able to be
+ // woken up, even though it's rather cumbersome.
+ int sock = socket(ai->ai_family, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, IPPROTO_TCP);
if (sock == -1) {
// Could be e.g. EPROTONOSUPPORT. The show must go on.
continue;
}
- // Now do a non-blocking connect. This is important because we want to be able to be
- // woken up, even though it's rather cumbersome.
-
- // Set the socket as nonblocking.
- int one = 1;
- if (ioctl(sock, FIONBIO, &one) == -1) {
- log_perror("ioctl(FIONBIO)");
- safe_close(sock);
- return -1;
- }
-
// Do a non-blocking connect.
do {
err = connect(sock, ai->ai_addr, ai->ai_addrlen);
return false;
}
- multimap<string, string> parameters = extract_headers(lines, url);
+ HTTPHeaderMultimap parameters = extract_headers(lines, url);
// Remove “Content-encoding: metacube”.
- // TODO: Make case-insensitive.
- const auto encoding_it = parameters.find("Content-encoding");
+ const auto encoding_it = parameters.find("Content-Encoding");
if (encoding_it != parameters.end() && encoding_it->second == "metacube") {
parameters.erase(encoding_it);
}
// Change “Server: foo” to “Server: metacube/0.1 (reflecting: foo)”
- // TODO: Make case-insensitive.
// XXX: Use a Via: instead?
if (parameters.count("Server") == 0) {
parameters.insert(make_pair("Server", SERVER_IDENTIFICATION));
}
// Erase “Connection: close”; we'll set it on the sending side if needed.
- // TODO: Make case-insensitive.
parameters.erase("Connection");
// Construct the new HTTP header.
pending_data.clear();
has_metacube_header = false;
for (int stream_index : stream_indices) {
- servers->set_header(stream_index, "", "");
+ // Don't zero out the header; it might still be of use to HLS clients.
+ servers->set_unavailable(stream_index);
}
{
++num_connection_attempts;
sock = lookup_and_connect(host, port);
if (sock != -1) {
- // Yay, successful connect. Try to set it as nonblocking.
- int one = 1;
- if (ioctl(sock, FIONBIO, &one) == -1) {
- log_perror("ioctl(FIONBIO)");
- state = CLOSING_SOCKET;
- } else {
- state = SENDING_REQUEST;
- request = "GET " + path + " HTTP/1.0\r\nHost: " + host_header(host, port) + "\r\nUser-Agent: cubemap\r\n\r\n";
- request_bytes_sent = 0;
- }
+ // Yay, successful connect.
+ state = SENDING_REQUEST;
+ request = "GET " + path + " HTTP/1.0\r\nHost: " + host_header(host, port) + "\r\nUser-Agent: cubemap\r\n\r\n";
+ request_bytes_sent = 0;
lock_guard<mutex> lock(stats_mutex);
stats.connect_time = time(nullptr);
if (encoding == Input::INPUT_ENCODING_RAW) {
for (int stream_index : stream_indices) {
- servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0);
+ servers->add_data(stream_index, ptr, bytes, /*metacube_flags=*/0, /*pts=*/RationalPTS());
}
return;
}
}
}
for (int stream_index : stream_indices) {
- servers->add_data(stream_index, inner_data, size, flags);
+ servers->add_data(stream_index, inner_data, size, flags, next_block_pts);
}
+ next_block_pts = RationalPTS();
}
// Consume the block. This isn't the most efficient way of dealing with things
}
uint64_t type = be64toh(*(const uint64_t *)payload);
- if (type != METACUBE_METADATA_TYPE_ENCODER_TIMESTAMP) {
- // Unknown metadata block, ignore.
- return;
- }
-
- timespec now;
- clock_gettime(CLOCK_REALTIME, &now);
+ if (type == METACUBE_METADATA_TYPE_ENCODER_TIMESTAMP) {
+ timespec now;
+ clock_gettime(CLOCK_REALTIME, &now);
+
+ const metacube2_timestamp_packet *pkt = (const metacube2_timestamp_packet *)payload;
+ if (payload_size != sizeof(*pkt)) {
+ log(WARNING, "[%s] Metacube timestamp block of wrong size (%d bytes); ignoring.",
+ url.c_str(), payload_size);
+ return;
+ }
- const metacube2_timestamp_packet *pkt = (const metacube2_timestamp_packet *)payload;
- if (payload_size != sizeof(*pkt)) {
- log(WARNING, "[%s] Metacube timestamp block of wrong size (%d bytes); ignoring.",
- url.c_str(), payload_size);
+ double elapsed = now.tv_sec - be64toh(pkt->tv_sec) +
+ 1e-9 * (now.tv_nsec - long(be64toh(pkt->tv_nsec)));
+ {
+ lock_guard<mutex> lock(stats_mutex);
+ stats.latency_sec = elapsed;
+ }
+ } else if (type == METACUBE_METADATA_TYPE_NEXT_BLOCK_PTS) {
+ const metacube2_pts_packet *pkt = (const metacube2_pts_packet *)payload;
+ if (payload_size != sizeof(*pkt)) {
+ log(WARNING, "[%s] Metacube pts block of wrong size (%d bytes); ignoring.",
+ url.c_str(), payload_size);
+ return;
+ }
+ next_block_pts.pts = be64toh(pkt->pts);
+ next_block_pts.timebase_num = be64toh(pkt->timebase_num);
+ next_block_pts.timebase_den = be64toh(pkt->timebase_den);
+ } else {
+ // Unknown metadata block, ignore
+ log(INFO, "[%s] Metadata block %llu\n", url.c_str(), type);
return;
}
-
- double elapsed = now.tv_sec - be64toh(pkt->tv_sec) +
- 1e-9 * (now.tv_nsec - long(be64toh(pkt->tv_nsec)));
- {
- lock_guard<mutex> lock(stats_mutex);
- stats.latency_sec = elapsed;
- }
}
projects / cubemap / blobdiff