X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=acceptor.cpp;h=87bf47b83ea1b1c09616fbd19c0410c6834bfc20;hp=7620b7991104d98d19364559b46d6778d4c7919e;hb=d60b2c17baf9b71e4a70a499fa1d34753821c822;hpb=e1722a5c0341fd541ce57f1eed4dc76cbd3efe07

diff --git a/acceptor.cpp b/acceptor.cpp
index 7620b79..87bf47b 100644
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -10,6 +10,7 @@
 
 #include "acceptor.h"
 #include "serverpool.h"
+#include "state.pb.h"
 
 using namespace std;
 
@@ -61,12 +62,39 @@ int create_server_socket(int port)
 	return server_sock;
 }
 	
-AcceptorThread::AcceptorThread(int server_sock)
-	: server_sock(server_sock)
+Acceptor::Acceptor(int server_sock, int port)
+	: server_sock(server_sock),
+	  port(port)
 {
 }
 
-void AcceptorThread::do_work()
+Acceptor::Acceptor(const AcceptorProto &serialized)
+	: server_sock(serialized.server_sock()),
+	  port(serialized.port())
+{
+}
+
+AcceptorProto Acceptor::serialize() const
+{
+	AcceptorProto serialized;
+	serialized.set_server_sock(server_sock);
+	serialized.set_port(port);
+	return serialized;
+}
+
+void Acceptor::close_socket()
+{
+	int ret;
+	do {
+		ret = close(server_sock);
+	} while (ret == -1 && errno == EINTR);
+
+	if (ret == -1) {
+		perror("close");
+	}
+}
+
+void Acceptor::do_work()
 {
 	while (!hupped) {
 		// Since we are non-blocking, we need to wait for the right state first.