X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=97a42b575477a6f89938d1333ac779db2b03842e;hb=6df110603b3a1248f52741e9d68d0bd032171b60;hp=fc6d61f14c8c065e43bf951a4cc8f52b5a7eac48;hpb=065568e3a84b596ea15f80f67574ea7708d4e111;p=libs%2Fnet.git

diff --git a/source/http/server.cpp b/source/http/server.cpp
index fc6d61f..97a42b5 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,16 @@ using namespace std;
 namespace Msp {
 namespace Http {
 
+Server::Server():
+	sock(Net::INET6),
+	event_disp(0)
+{ }
+
 Server::Server(unsigned port):
-	sock(Net::INET),
+	sock(Net::INET6),
 	event_disp(0)
 {
-	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 +34,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();
@@ -90,11 +102,19 @@ void Server::client_data_available(Client &cl)
 			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)
@@ -106,7 +126,7 @@ void Server::client_data_available(Client &cl)
 				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")
@@ -123,14 +143,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);
 	}
 
@@ -164,7 +185,8 @@ void Server::client_data_available(Client &cl)
 			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()));
 		}
 	}
 
@@ -176,7 +198,17 @@ 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)
 	{