#include <exception>
+#include <typeinfo>
+#include <msp/core/maputils.h>
#include <msp/core/refptr.h>
+#include <msp/debug/demangle.h>
#include <msp/net/inet.h>
#include <msp/net/resolve.h>
#include <msp/net/streamsocket.h>
#include <msp/strings/format.h>
+#include <msp/strings/utils.h>
#include "request.h"
#include "response.h"
#include "server.h"
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<Net::SockAddr> addr = Net::resolve("*", format("%d", port));
+ listen(port);
+}
+
+// Avoid emitting sigc::signal destructor in files including server.h
+Server::~Server()
+{
+}
+
+void Server::listen(unsigned port)
+{
+ RefPtr<Net::SockAddr> 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
if(event_disp)
{
event_disp->remove(sock);
- for(list<Client>::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<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
- event_disp->add(*i->sock);
+ for(Client &c: clients)
+ event_disp->add(*c.sock);
}
}
{
Client &cl = get_client_by_response(resp);
if(cl.async)
+ 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)
{
- cl.sock->write(resp.str());
- cl.stale = true;
+ 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::client_data_available(Client &cl)
{
- for(list<Client>::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));
- cl.in_buf.append(rbuf, len);
+ 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;
+ }
RefPtr<Response> response;
if(!cl.request)
cl.request = new Request(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(':');
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->add_content("Method not implemented\n");
}
+ else if(cl.request->get_path()[0]!='/')
+ {
+ response = new Response(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->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);
}
if(cl.request && cl.request->is_complete() && !response)
{
+ cl.keepalive = false;
+ if(cl.request->has_header("Connection"))
+ cl.keepalive = !strcasecmp(cl.request->get_header("Connection"), "keep-alive");
+
response = new Response(NONE);
try
{
cl.response = response.get();
+ responses[cl.response] = &cl;
signal_request.emit(*cl.request, *response);
if(cl.async)
response.release();
else
{
+ responses.erase(cl.response);
cl.response = 0;
if(response->get_status()==NONE)
{
}
catch(const exception &e)
{
+ responses.erase(cl.response);
cl.response = 0;
response = new Response(INTERNAL_ERROR);
- response->add_content(e.what());
+ response->add_content(format("An error occurred while processing the request:\ntype: %s\nwhat: %s",
+ Debug::demangle(typeid(e).name()), e.what()));
}
}
if(response)
+ send_response(cl, *response);
+}
+
+void Server::send_response(Client &cl, Response &resp)
+{
+ if(cl.keepalive)
+ resp.set_header("Connection", "keep-alive");
+
+ try
+ {
+ cl.sock->write(resp.str());
+ }
+ catch(const exception &)
{
- cl.sock->write(response->str());
+ cl.stale = true;
+ return;
+ }
+
+ cl.async = false;
+ if(cl.keepalive)
+ {
+ delete cl.request;
+ cl.request = 0;
+ delete cl.response;
+ cl.response = 0;
+ }
+ else
+ {
+ cl.sock->shutdown(IO::M_WRITE);
cl.stale = true;
}
}
Server::Client &Server::get_client_by_response(Response &resp)
{
- for(list<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
- if(i->response==&resp)
- return *i;
-
- // XXX Do this differently
- throw invalid_argument("Response does not belong to any client");
+ return *get_item(responses, &resp);
}
Server::Client::Client(RefPtr<Net::StreamSocket> s):
- sock(s),
- request(0),
- response(0),
- async(false),
- stale(false)
+ sock(s)
{ }
Server::Client::~Client()
projects / libs / net.git / blobdiff