X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fhttp%2Fserver.cpp;h=667403e86788c9228e179e1f9677feb1552fb6cc;hb=ee01d294f9078fbf17dc6a0a645ad3a342c49b1a;hp=f985bf994526bf871844b97cfd263f2ee56ee2ef;hpb=d20870655aeca0614d9fc315fe5f9893ebdc7aa3;p=libs%2Fnet.git

diff --git a/source/http/server.cpp b/source/http/server.cpp
index f985bf9..667403e 100644
--- a/source/http/server.cpp
+++ b/source/http/server.cpp
@@ -17,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
@@ -31,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();
@@ -73,6 +83,29 @@ 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(list<Client>::iterator i=clients.begin(); i!=clients.end(); ++i)
+	{
+		i->sock->shutdown(IO::M_WRITE);
+		poller.set_object(*i->sock, IO::P_INPUT);
+	}
+
+	while(!clients.empty() && poller.poll(timeout))
+	{
+		const vector<IO::Poller::PolledObject> &result = poller.get_result();
+		for(vector<IO::Poller::PolledObject>::const_iterator i=result.begin(); i!=result.end(); ++i)
+			for(list<Client>::iterator j=clients.begin(); j!=clients.end(); ++j)
+				if(j->sock.get()==i->object)
+				{
+					poller.set_object(*j->sock, IO::P_NONE);
+					clients.erase(j);
+					break;
+				}
+	}
+}
+
 void Server::data_available()
 {
 	Net::StreamSocket *csock = sock.accept();