X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fserver.cpp;h=259d13b087598d5ae602f1c4b16e7ec6ed24259e;hb=c8df43e7794dc82d5604dfa612e464bbc5ca3cdd;hp=7f159ac8497c10c48019e8f90e81f82dfbfa5e29;hpb=b06cf07513fdd85e249398ebfce500fbf3dfb6a7;p=libs%2Fnet.git

diff --git a/source/server.cpp b/source/server.cpp
index 7f159ac..259d13b 100644
--- a/source/server.cpp
+++ b/source/server.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmsphttp
-Copyright © 2008  Mikkosoft Productions, Mikko Rasa
-Distributed under the LGPL
-*/
-
 #include <exception>
 #include <msp/core/refptr.h>
 #include <msp/net/inet.h>
@@ -26,6 +19,14 @@ Server::Server(unsigned port):
 	sock.listen(Net::InetAddr(0, port), 8);
 }
 
+unsigned Server::get_port() const
+{
+	const Net::SockAddr &addr = sock.get_local_address();
+	if(addr.get_family()==Net::INET)
+		return static_cast<const Net::InetAddr &>(addr).get_port();
+	return 0;
+}
+
 void Server::use_event_dispatcher(IO::EventDispatcher *ed)
 {
 	if(event_disp)
@@ -34,7 +35,7 @@ void Server::use_event_dispatcher(IO::EventDispatcher *ed)
 		for(list<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
 			event_disp->remove(*i->sock);
 	}
-	event_disp=ed;
+	event_disp = ed;
 	if(event_disp)
 	{
 		event_disp->add(sock);
@@ -43,9 +44,24 @@ void Server::use_event_dispatcher(IO::EventDispatcher *ed)
 	}
 }
 
+void Server::delay_response(Response &resp)
+{
+	get_client_by_response(resp).async = true;
+}
+
+void Server::submit_response(Response &resp)
+{
+	Client &cl = get_client_by_response(resp);
+	if(cl.async)
+	{
+		cl.sock->write(resp.str());
+		cl.stale = true;
+	}
+}
+
 void Server::data_available()
 {
-	Net::StreamSocket *csock=sock.accept();
+	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())));
@@ -63,7 +79,7 @@ void Server::client_data_available(Client &cl)
 		}
 
 	char rbuf[4096];
-	unsigned len=cl.sock->read(rbuf, sizeof(rbuf));
+	unsigned len = cl.sock->read(rbuf, sizeof(rbuf));
 	cl.in_buf.append(rbuf, len);
 
 	RefPtr<Response> response;
@@ -73,42 +89,55 @@ void Server::client_data_available(Client &cl)
 		{
 			try
 			{
-				cl.request=new Request(Request::parse(cl.in_buf));
-				if(cl.request->get_method()!="GET")
+				cl.request = new Request(Request::parse(cl.in_buf));
+
+				string addr_str = cl.sock->get_peer_address().str();
+				unsigned 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");
+					response = new Response(NOT_IMPLEMENTED);
+					response->add_content("Method not implemented\n");
 				}
 			}
 			catch(const exception &e)
 			{
-				response=new Response(BAD_REQUEST);
+				response = new Response(BAD_REQUEST);
 				response->add_content(e.what());
 			}
-			cl.in_buf=string();
+			cl.in_buf = string();
 		}
 	}
 	else
 	{
-		len=cl.request->parse_content(cl.in_buf);
+		len = cl.request->parse_content(cl.in_buf);
 		cl.in_buf.erase(0, len);
 	}
 
 	if(cl.request && cl.request->is_complete() && !response)
 	{
-		response=new Response(NONE);
+		response = new Response(NONE);
 		try
 		{
+			cl.response = response.get();
 			signal_request.emit(*cl.request, *response);
-			if(response->get_status()==NONE)
+			if(cl.async)
+				response.release();
+			else
 			{
-				response=new Response(NOT_FOUND);
-				response->add_content("The requested resource was not found");
+				cl.response = 0;
+				if(response->get_status()==NONE)
+				{
+					response = new Response(NOT_FOUND);
+					response->add_content("The requested resource was not found\n");
+				}
 			}
 		}
 		catch(const exception &e)
 		{
-			response=new Response(INTERNAL_ERROR);
+			cl.response = 0;
+			response = new Response(INTERNAL_ERROR);
 			response->add_content(e.what());
 		}
 	}
@@ -116,26 +145,38 @@ void Server::client_data_available(Client &cl)
 	if(response)
 	{
 		cl.sock->write(response->str());
-		cl.sock->close();
-		cl.stale=true;
+		cl.stale = true;
 	}
 }
 
 void Server::client_end_of_file(Client &cl)
 {
-	cl.stale=true;
+	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");
 }
 
 
 Server::Client::Client(RefPtr<Net::StreamSocket> s):
 	sock(s),
 	request(0),
+	response(0),
+	async(false),
 	stale(false)
 { }
 
 Server::Client::~Client()
 {
 	delete request;
+	delete response;
 }
 
 } // namespace Http