X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=a7435d330350b41e60416dbc3eb632d840b742ab;hb=3ab65d35cfd696002e09768a38f98e6a2e1ade81;hp=f0474fd18e993c57de16b1a3f51c07dc260f069f;hpb=b4e0f7ed23f24e78fd09c9b7f206279e16d38c1e;p=libs%2Fnet.git

diff --git a/source/http/server.cpp b/source/http/server.cpp
index f0474fd..a7435d3 100644
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -1,6 +1,8 @@
 #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>
@@ -15,13 +17,14 @@ 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<Net::SockAddr> addr = Net::resolve("*", format("%d", port));
-	sock.listen(*addr, 8);
+	listen(port);
 }
 
 // Avoid emitting sigc::signal destructor in files including server.h
@@ -29,6 +32,13 @@ 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
 {
 	const Net::SockAddr &addr = sock.get_local_address();
@@ -42,15 +52,15 @@ void Server::use_event_dispatcher(IO::EventDispatcher *ed)
 	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);
 	}
 }
 
@@ -71,6 +81,28 @@ 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();
@@ -83,18 +115,26 @@ void Server::data_available()
 
 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));
-	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> response;
 	if(!cl.request)
@@ -123,14 +163,15 @@ void Server::client_data_available(Client &cl)
 			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);
 	}
 
@@ -151,7 +192,7 @@ void Server::client_data_available(Client &cl)
 			else
 			{
 				responses.erase(cl.response);
-				cl.response = 0;
+				cl.response = nullptr;
 				if(response->get_status()==NONE)
 				{
 					response = new Response(NOT_FOUND);
@@ -162,9 +203,10 @@ void Server::client_data_available(Client &cl)
 		catch(const exception &e)
 		{
 			responses.erase(cl.response);
-			cl.response = 0;
+			cl.response = nullptr;
 			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()));
 		}
 	}
 
@@ -176,14 +218,24 @@ void Server::send_response(Client &cl, Response &resp)
 {
 	if(cl.keepalive)
 		resp.set_header("Connection", "keep-alive");
-	cl.sock->write(resp.str());
+
+	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;
+		cl.request = nullptr;
 		delete cl.response;
-		cl.response = 0;
+		cl.response = nullptr;
 	}
 	else
 	{
@@ -204,12 +256,7 @@ Server::Client &Server::get_client_by_response(Response &resp)
 
 
 Server::Client::Client(RefPtr<Net::StreamSocket> s):
-	sock(s),
-	request(0),
-	response(0),
-	keepalive(false),
-	async(false),
-	stale(false)
+	sock(s)
 { }
 
 Server::Client::~Client()