#include <stdint.h>
#include <assert.h>
#include <arpa/inet.h>
-#include <curl/curl.h>
#include <sys/socket.h>
#include <pthread.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/epoll.h>
+#include <time.h>
+#include <signal.h>
#include <errno.h>
#include <vector>
#include <string>
Client::Client(int sock)
: sock(sock),
+ connect_time(time(NULL)),
state(Client::READING_REQUEST),
stream(NULL),
header_or_error_bytes_sent(0),
bytes_sent(0)
{
request.reserve(1024);
+
+ // Find the remote address, and convert it to ASCII.
+ sockaddr_in6 addr;
+ socklen_t addr_len = sizeof(addr);
+
+ if (getpeername(sock, reinterpret_cast<sockaddr *>(&addr), &addr_len) == -1) {
+ perror("getpeername");
+ remote_addr = "";
+ } else {
+ char buf[INET6_ADDRSTRLEN];
+ if (inet_ntop(addr.sin6_family, &addr.sin6_addr, buf, sizeof(buf)) == NULL) {
+ perror("inet_ntop");
+ remote_addr = "";
+ } else {
+ remote_addr = buf;
+ }
+ }
}
Client::Client(const ClientProto &serialized, Stream *stream)
: sock(serialized.sock()),
+ remote_addr(serialized.remote_addr()),
+ connect_time(serialized.connect_time()),
state(State(serialized.state())),
request(serialized.request()),
stream_id(serialized.stream_id()),
{
ClientProto serialized;
serialized.set_sock(sock);
+ serialized.set_remote_addr(remote_addr);
+ serialized.set_connect_time(connect_time);
serialized.set_state(state);
serialized.set_request(request);
serialized.set_stream_id(stream_id);
serialized.set_bytes_sent(bytes_sent);
return serialized;
}
+
+ClientStats Client::get_stats() const
+{
+ ClientStats stats;
+ stats.stream_id = stream_id;
+ stats.remote_addr = remote_addr;
+ stats.connect_time = connect_time;
+ stats.bytes_sent = bytes_sent;
+ return stats;
+}
Stream::Stream(const string &stream_id)
: stream_id(stream_id),
should_stop = true;
}
+ pthread_kill(worker_thread, SIGHUP);
if (pthread_join(worker_thread, NULL) == -1) {
perror("pthread_join");
exit(1);
}
}
+
+vector<ClientStats> Server::get_client_stats() const
+{
+ vector<ClientStats> ret;
+
+ MutexLock lock(&mutex);
+ for (map<int, Client>::const_iterator client_it = clients.begin();
+ client_it != clients.end();
+ ++client_it) {
+ ret.push_back(client_it->second.get_stats());
+ }
+ return ret;
+}
void *Server::do_work_thunk(void *arg)
{
for ( ;; ) {
int nfds = epoll_wait(epoll_fd, events, EPOLL_MAX_EVENTS, EPOLL_TIMEOUT_MS);
if (nfds == -1 && errno == EINTR) {
+ if (should_stop) {
+ return;
+ }
continue;
}
if (nfds == -1) {
MutexLock lock(&mutex); // We release the mutex between iterations.
- if (should_stop) {
- return;
- }
-
process_queued_data();
for (int i = 0; i < nfds; ++i) {
for (map<string, Stream *>::iterator stream_it = streams.begin();
stream_it != streams.end();
++stream_it) {
- Stream *stream = stream_it->second;
- for (size_t i = 0; i < stream->to_process.size(); ++i) {
- process_client(stream->to_process[i]);
+ vector<Client *> to_process;
+ swap(stream_it->second->to_process, to_process);
+ for (size_t i = 0; i < to_process.size(); ++i) {
+ process_client(to_process[i]);
}
- stream->to_process.clear();
+ }
+
+ if (should_stop) {
+ return;
}
}
}
return;
}
- // Guard against overlong requests gobbling up all of our space.
- if (client->request.size() + ret > MAX_CLIENT_REQUEST) {
+ RequestParseStatus status = wait_for_double_newline(&client->request, buf, ret);
+
+ switch (status) {
+ case RP_OUT_OF_SPACE:
fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
close_client(client);
return;
- }
-
- // See if we have \r\n\r\n anywhere in the request. We start three bytes
- // before what we just appended, in case we just got the final character.
- size_t existing_req_bytes = client->request.size();
- client->request.append(string(buf, buf + ret));
-
- size_t start_at = (existing_req_bytes >= 3 ? existing_req_bytes - 3 : 0);
- const char *ptr = reinterpret_cast<char *>(
- memmem(client->request.data() + start_at, client->request.size() - start_at,
- "\r\n\r\n", 4));
- if (ptr == NULL) {
+ case RP_NOT_FINISHED_YET:
// OK, we don't have the entire header yet. Fine; we'll get it later.
// See if there's more data for us.
goto read_request_again;
- }
-
- if (ptr != client->request.data() + client->request.size() - 4) {
+ case RP_EXTRA_DATA:
fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
close_client(client);
return;
+ case RP_FINISHED:
+ break;
}
+ assert(status == RP_FINISHED);
+
int error_code = parse_request(client);
if (error_code == 200) {
construct_header(client);
void Server::construct_header(Client *client)
{
- 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;
+ client->header_or_error = find_stream(client->stream_id)->header;
// Switch states.
client->state = Client::SENDING_HEADER;
exit(1);
}
}
+
+template<class T>
+void delete_from(vector<T> *v, T elem)
+{
+ typename vector<T>::iterator new_end = remove(v->begin(), v->end(), elem);
+ v->erase(new_end, v->end());
+}
void Server::close_client(Client *client)
{
// This client could be sleeping, so we'll need to fix that. (Argh, O(n).)
if (client->stream != NULL) {
- vector<Client *>::iterator new_end =
- remove(client->stream->sleeping_clients.begin(),
- client->stream->sleeping_clients.end(),
- client);
- client->stream->sleeping_clients.erase(
- new_end, client->stream->sleeping_clients.end());
+ delete_from(&client->stream->sleeping_clients, client);
+ delete_from(&client->stream->to_process, client);
}
// Bye-bye!
projects / cubemap / blobdiff