X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=f0474fd18e993c57de16b1a3f51c07dc260f069f;hb=HEAD;hp=fbacb10accfc6a1de8c4497503c357aa457a16ac;hpb=09858e5a153b0667b4885da81f6f979a0bf29c36;p=libs%2Fnet.git diff --git a/source/http/server.cpp b/source/http/server.cpp index fbacb10..04bae0b 100644 --- a/source/http/server.cpp +++ b/source/http/server.cpp @@ -1,26 +1,29 @@ +#include "server.h" #include +#include #include -#include +#include #include #include #include #include +#include #include "request.h" #include "response.h" -#include "server.h" using namespace std; namespace Msp { namespace Http { +Server::Server(): + sock(Net::INET6) +{ } + Server::Server(unsigned port): - sock(Net::INET), - event_disp(0) + sock(Net::INET6) { - sock.signal_data_available.connect(sigc::mem_fun(this, &Server::data_available)); - RefPtr addr = Net::resolve("*", format("%d", port)); - sock.listen(*addr, 8); + listen(port); } // Avoid emitting sigc::signal destructor in files including server.h @@ -28,6 +31,13 @@ Server::~Server() { } +void Server::listen(unsigned port) +{ + unique_ptr addr(Net::resolve("*", format("%d", port), Net::INET6)); + sock.listen(*addr, 8); + sock.signal_data_available.connect(sigc::mem_fun(this, &Server::data_available)); +} + unsigned Server::get_port() const { const Net::SockAddr &addr = sock.get_local_address(); @@ -41,15 +51,15 @@ void Server::use_event_dispatcher(IO::EventDispatcher *ed) if(event_disp) { event_disp->remove(sock); - for(list::iterator i=clients.begin(); i!=clients.end(); ++i) - event_disp->remove(*i->sock); + for(Client &c: clients) + event_disp->remove(*c.sock); } event_disp = ed; if(event_disp) { event_disp->add(sock); - for(list::iterator i=clients.begin(); i!=clients.end(); ++i) - event_disp->add(*i->sock); + for(Client &c: clients) + event_disp->add(*c.sock); } } @@ -65,66 +75,103 @@ void Server::submit_response(Response &resp) send_response(cl, *cl.response); } +void Server::cancel_keepalive(Response &resp) +{ + get_client_by_response(resp).keepalive = false; +} + +void Server::close_connections(const Time::TimeDelta &timeout) +{ + IO::Poller poller; + for(Client &c: clients) + { + c.sock->shutdown(IO::M_WRITE); + poller.set_object(*c.sock, IO::P_INPUT); + } + + while(!clients.empty() && poller.poll(timeout)) + { + for(const IO::Poller::PolledObject &p: poller.get_result()) + for(auto j=clients.begin(); j!=clients.end(); ++j) + if(j->sock.get()==p.object) + { + poller.set_object(*j->sock, IO::P_NONE); + clients.erase(j); + break; + } + } +} + void Server::data_available() { - Net::StreamSocket *csock = sock.accept(); - clients.push_back(Client(csock)); - csock->signal_data_available.connect(sigc::bind(sigc::mem_fun(this, &Server::client_data_available), sigc::ref(clients.back()))); - csock->signal_end_of_file.connect(sigc::bind(sigc::mem_fun(this, &Server::client_end_of_file), sigc::ref(clients.back()))); + unique_ptr csock(sock.accept()); + clients.emplace_back(move(csock)); + Client &cl = clients.back(); + cl.sock->signal_data_available.connect(sigc::bind(sigc::mem_fun(this, &Server::client_data_available), sigc::ref(clients.back()))); + cl.sock->signal_end_of_file.connect(sigc::bind(sigc::mem_fun(this, &Server::client_end_of_file), sigc::ref(clients.back()))); if(event_disp) - event_disp->add(*csock); + event_disp->add(*cl.sock); } void Server::client_data_available(Client &cl) { - for(list::iterator i=clients.begin(); i!=clients.end(); ++i) + for(auto i=clients.begin(); i!=clients.end(); ++i) if(i->stale && &*i!=&cl) { clients.erase(i); break; } - char rbuf[4096]; - unsigned len = cl.sock->read(rbuf, sizeof(rbuf)); - if(cl.stale) + try + { + char rbuf[4096]; + unsigned len = cl.sock->read(rbuf, sizeof(rbuf)); + if(cl.stale) + return; + cl.in_buf.append(rbuf, len); + } + catch(const exception &) + { + cl.stale = true; return; - cl.in_buf.append(rbuf, len); + } - RefPtr response; + unique_ptr response; if(!cl.request) { if(cl.in_buf.find("\r\n\r\n")!=string::npos || cl.in_buf.find("\n\n")!=string::npos) { try { - cl.request = new Request(Request::parse(cl.in_buf)); + cl.request = make_unique(Request::parse(cl.in_buf)); string addr_str = cl.sock->get_peer_address().str(); - unsigned colon = addr_str.find(':'); + string::size_type colon = addr_str.find(':', (addr_str[0]=='[' ? addr_str.find(']')+1 : 0)); cl.request->set_header("-Client-Host", addr_str.substr(0, colon)); if(cl.request->get_method()!="GET" && cl.request->get_method()!="POST") { - response = new Response(NOT_IMPLEMENTED); + response = make_unique(NOT_IMPLEMENTED); response->add_content("Method not implemented\n"); } else if(cl.request->get_path()[0]!='/') { - response = new Response(BAD_REQUEST); + response = make_unique(BAD_REQUEST); response->add_content("Path must be absolute\n"); } } catch(const exception &e) { - response = new Response(BAD_REQUEST); - response->add_content(e.what()); + response = make_unique(BAD_REQUEST); + response->add_content(format("An error occurred while parsing request headers:\ntype: %s\nwhat: %s", + Debug::demangle(typeid(e).name()), e.what())); } cl.in_buf = string(); } } else { - len = cl.request->parse_content(cl.in_buf); + unsigned len = cl.request->parse_content(cl.in_buf); cl.in_buf.erase(0, len); } @@ -132,33 +179,32 @@ void Server::client_data_available(Client &cl) { cl.keepalive = false; if(cl.request->has_header("Connection")) - cl.keepalive = (cl.request->get_header("Connection")=="keep-alive"); + cl.keepalive = !strcasecmp(cl.request->get_header("Connection"), "keep-alive"); - response = new Response(NONE); + response = make_unique(NONE); try { - cl.response = response.get(); - responses[cl.response] = &cl; - signal_request.emit(*cl.request, *response); - if(cl.async) - response.release(); - else + cl.response = move(response); + responses[cl.response.get()] = &cl; + signal_request.emit(*cl.request, *cl.response); + if(!cl.async) { - responses.erase(cl.response); - cl.response = 0; + responses.erase(cl.response.get()); + response = move(cl.response); if(response->get_status()==NONE) { - response = new Response(NOT_FOUND); + response = make_unique(NOT_FOUND); response->add_content("The requested resource was not found\n"); } } } catch(const exception &e) { - responses.erase(cl.response); - cl.response = 0; - response = new Response(INTERNAL_ERROR); - response->add_content(e.what()); + responses.erase(cl.response.get()); + cl.response.reset(); + response = make_unique(INTERNAL_ERROR); + response->add_content(format("An error occurred while processing the request:\ntype: %s\nwhat: %s", + Debug::demangle(typeid(e).name()), e.what())); } } @@ -168,14 +214,24 @@ void Server::client_data_available(Client &cl) void Server::send_response(Client &cl, Response &resp) { - cl.sock->write(resp.str()); + if(cl.keepalive) + resp.set_header("Connection", "keep-alive"); + + try + { + cl.sock->write(resp.str()); + } + catch(const exception &) + { + cl.stale = true; + return; + } + cl.async = false; if(cl.keepalive) { - delete cl.request; - cl.request = 0; - delete cl.response; - cl.response = 0; + cl.request.reset(); + cl.response.reset(); } else { @@ -195,20 +251,9 @@ Server::Client &Server::get_client_by_response(Response &resp) } -Server::Client::Client(RefPtr s): - sock(s), - request(0), - response(0), - keepalive(false), - async(false), - stale(false) +Server::Client::Client(unique_ptr s): + sock(move(s)) { } -Server::Client::~Client() -{ - delete request; - delete response; -} - } // namespace Http } // namespace Msp