#include <sys/socket.h>
#include <time.h>
#include <unistd.h>
+#include <math.h>
#include <string>
#include "acceptor.h"
#include "log.h"
-#include "mutexlock.h"
#include "serverpool.h"
#include "state.pb.h"
#include "stream.h"
ip.c_str());
return false;
}
- if (inet_pton(AF_INET6, ip.c_str(), &addr6->sin6_addr) != 1) {
- log(ERROR, "'%s' is not a valid IPv6 address");
+ string raw_ip(ip.begin() + 1, ip.end() - 1);
+ if (inet_pton(AF_INET6, raw_ip.c_str(), &addr6->sin6_addr) != 1) {
+ log(ERROR, "'%s' is not a valid IPv6 address", raw_ip.c_str());
return false;
}
} else {
construct_header();
- pthread_mutex_init(&stats_mutex, NULL);
stats.url = url;
- stats.bytes_received = 0;
- stats.data_bytes_received = 0;
- stats.connect_time = time(NULL);
+ stats.connect_time = time(nullptr);
}
UDPInput::UDPInput(const InputProto &serialized)
construct_header();
- pthread_mutex_init(&stats_mutex, NULL);
stats.url = url;
stats.bytes_received = serialized.bytes_received();
stats.data_bytes_received = serialized.data_bytes_received();
if (serialized.has_connect_time()) {
stats.connect_time = serialized.connect_time();
} else {
- stats.connect_time = time(NULL);
+ stats.connect_time = time(nullptr);
}
}
serialized.set_bytes_received(stats.bytes_received);
serialized.set_data_bytes_received(stats.data_bytes_received);
serialized.set_connect_time(stats.connect_time);
+ serialized.set_is_metacube_encoded(false);
return serialized;
}
}
// Wait for a packet, or a wakeup.
- bool activity = wait_for_activity(sock, POLLIN, NULL);
+ bool activity = wait_for_activity(sock, POLLIN, nullptr);
if (!activity) {
// Most likely, should_stop was set.
continue;
ret = recv(sock, packet_buf, sizeof(packet_buf), 0);
} while (ret == -1 && errno == EINTR);
- if (ret <= 0) {
+ if (ret < 0) { // Note that zero-byte packets are legal.
log_perror("recv");
close_socket();
continue;
}
{
- MutexLock lock(&stats_mutex);
+ lock_guard<mutex> lock(stats_mutex);
stats.bytes_received += ret;
stats.data_bytes_received += ret;
}
-
- for (size_t i = 0; i < stream_indices.size(); ++i) {
- servers->add_data(stream_indices[i], packet_buf, ret, SUITABLE_FOR_STREAM_START);
+
+ for (size_t stream_index : stream_indices) {
+ servers->add_data(stream_index, packet_buf, ret, /*metacube_flags=*/0, /*pts=*/RationalPTS());
}
}
}
InputStats UDPInput::get_stats() const
{
- MutexLock lock(&stats_mutex);
+ lock_guard<mutex> lock(stats_mutex);
return stats;
}