#include "metacube.h"
#include "server.h"
#include "mutexlock.h"
+#include "parse.h"
#include "state.pb.h"
using namespace std;
Client::Client(int sock)
: sock(sock),
state(Client::READING_REQUEST),
- header_bytes_sent(0),
+ header_or_error_bytes_sent(0),
bytes_sent(0)
{
request.reserve(1024);
state(State(serialized.state())),
request(serialized.request()),
stream_id(serialized.stream_id()),
- header(serialized.header()),
- header_bytes_sent(serialized.header_bytes_sent()),
+ header_or_error(serialized.header_or_error()),
+ header_or_error_bytes_sent(serialized.header_or_error_bytes_sent()),
bytes_sent(serialized.bytes_sent())
{
}
serialized.set_state(state);
serialized.set_request(request);
serialized.set_stream_id(stream_id);
- serialized.set_header(header);
- serialized.set_header_bytes_sent(serialized.header_bytes_sent());
+ serialized.set_header_or_error(header_or_error);
+ serialized.set_header_or_error_bytes_sent(serialized.header_or_error_bytes_sent());
serialized.set_bytes_sent(bytes_sent);
return serialized;
}
Server::~Server()
{
- close(epoll_fd);
+ int ret;
+ do {
+ ret = close(epoll_fd);
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1) {
+ perror("close(epoll_fd)");
+ }
}
void Server::run()
{
for ( ;; ) {
int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
+ if (nfds == -1 && errno == EINTR) {
+ continue;
+ }
if (nfds == -1) {
perror("epoll_wait");
exit(1);
case Client::READING_REQUEST: {
// Try to read more of the request.
char buf[1024];
- int ret = read(client->sock, buf, sizeof(buf));
+ int ret;
+ do {
+ ret = read(client->sock, buf, sizeof(buf));
+ } while (ret == -1 && errno == EINTR);
if (ret == -1) {
perror("read");
close_client(client);
return;
}
- parse_request(client);
- construct_header(client);
+ int error_code = parse_request(client);
+ if (error_code == 200) {
+ construct_header(client);
+ } else {
+ construct_error(client, error_code);
+ }
break;
}
+ case Client::SENDING_ERROR:
case Client::SENDING_HEADER: {
- int ret = write(client->sock,
- client->header.data() + client->header_bytes_sent,
- client->header.size() - client->header_bytes_sent);
+ 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);
+ } while (ret == -1 && errno == EINTR);
if (ret == -1) {
perror("write");
close_client(client);
return;
}
- client->header_bytes_sent += ret;
- assert(client->header_bytes_sent <= client->header.size());
+ client->header_or_error_bytes_sent += ret;
+ assert(client->header_or_error_bytes_sent <= client->header_or_error.size());
- if (client->header_bytes_sent < client->header.size()) {
+ if (client->header_or_error_bytes_sent < client->header_or_error.size()) {
// We haven't sent all yet. Fine; we'll do that later.
return;
}
- // We're done sending the header! Clear the entire header to release some memory.
- client->header.clear();
+ // We're done sending the header or error! Clear it to release some memory.
+ client->header_or_error.clear();
- // Start sending from the end. In other words, we won't send any of the backlog,
- // but we'll start sending immediately as we get data.
- client->state = Client::SENDING_DATA;
- client->bytes_sent = find_stream(client->stream_id)->data_size;
+ if (client->state == Client::SENDING_ERROR) {
+ close_client(client);
+ } else {
+ // Start sending from the end. In other words, we won't send any of the backlog,
+ // but we'll start sending immediately as we get data.
+ client->state = Client::SENDING_DATA;
+ client->bytes_sent = find_stream(client->stream_id)->data_size;
+ }
break;
}
case Client::SENDING_DATA: {
iov[1].iov_base = const_cast<char *>(stream.data);
iov[1].iov_len = bytes_to_send - bytes_first_part;
- ret = writev(client->sock, iov, 2);
+ do {
+ ret = writev(client->sock, iov, 2);
+ } while (ret == -1 && errno == EINTR);
} else {
- ret = write(client->sock,
- stream.data + (client->bytes_sent % BACKLOG_SIZE),
- bytes_to_send);
+ do {
+ ret = write(client->sock,
+ stream.data + (client->bytes_sent % BACKLOG_SIZE),
+ bytes_to_send);
+ } while (ret == -1 && errno == EINTR);
}
if (ret == -1) {
perror("write/writev");
}
}
-void Server::parse_request(Client *client)
+int Server::parse_request(Client *client)
{
- // TODO: Actually parse the request. :-)
- client->stream_id = "stream";
+ vector<string> lines = split_lines(client->request);
+ if (lines.empty()) {
+ return 400; // Bad request (empty).
+ }
+
+ vector<string> request_tokens = split_tokens(lines[0]);
+ if (request_tokens.size() < 2) {
+ return 400; // Bad request (empty).
+ }
+ if (request_tokens[0] != "GET") {
+ return 400; // Should maybe be 405 instead?
+ }
+ if (streams.count(request_tokens[1]) == 0) {
+ return 404; // Not found.
+ }
+
+ client->stream_id = request_tokens[1];
client->request.clear();
+
+ return 200; // OK!
}
void Server::construct_header(Client *client)
{
- client->header = "HTTP/1.0 200 OK\r\nContent-type: video/x-flv\r\nCache-Control: no-cache\r\n\r\n" +
+ client->header_or_error = "HTTP/1.0 200 OK\r\nContent-type: video/x-flv\r\nCache-Control: no-cache\r\n\r\n" +
find_stream(client->stream_id)->header;
// Switch states.
}
}
+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_error = error;
+
+ // Switch states.
+ client->state = Client::SENDING_ERROR;
+
+ epoll_event ev;
+ ev.events = EPOLLOUT | EPOLLRDHUP;
+ ev.data.u64 = 0; // Keep Valgrind happy.
+ ev.data.fd = client->sock;
+
+ if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
+ perror("epoll_ctl(EPOLL_CTL_MOD)");
+ exit(1);
+ }
+}
+
void Server::close_client(Client *client)
{
if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, client->sock, NULL) == -1) {
sleeping_clients.erase(new_end, sleeping_clients.end());
// Bye-bye!
- close(client->sock);
+ int ret;
+ do {
+ ret = close(client->sock);
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1) {
+ perror("close");
+ }
+
clients.erase(client->sock);
}
projects / cubemap / blobdiff