X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=acceptor.cpp;h=fbc5b04390d06929e0b53493e0e8f8fe55350c86;hp=0b8de507af4d0b5576cb2f9aa309ba6e68519a62;hb=ca9624c43b968a0f29ea44e47851ff686bb64bb6;hpb=3f82e5f8ede16a712aa0bcd0913d2d8e3689742c

diff --git a/acceptor.cpp b/acceptor.cpp
index 0b8de50..fbc5b04 100644
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <signal.h>
 #include <errno.h>
 #include <arpa/inet.h>
 #include <sys/ioctl.h>
@@ -9,15 +10,22 @@
 
 #include "acceptor.h"
 #include "serverpool.h"
+#include "state.pb.h"
 
 using namespace std;
 
 extern ServerPool *servers;
 extern volatile bool hupped;
 
-int create_server_socket(int port)
+int create_server_socket(int port, SocketType socket_type)
 {
-	int server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
+	int server_sock;
+	if (socket_type == TCP_SOCKET) {
+		server_sock = socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP);
+	} else {
+		assert(socket_type == UDP_SOCKET);
+		server_sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+	}
 	if (server_sock == -1) {
 		perror("socket");
 		exit(1);
@@ -52,17 +60,50 @@ int create_server_socket(int port)
 		exit(1);
 	}
 
-	if (listen(server_sock, 128) == -1) {
-		perror("listen");
-		exit(1);
+	if (socket_type == TCP_SOCKET) {
+		if (listen(server_sock, 128) == -1) {
+			perror("listen");
+			exit(1);
+		}
 	}
 
 	return server_sock;
 }
+	
+Acceptor::Acceptor(int server_sock, int port)
+	: server_sock(server_sock),
+	  port(port)
+{
+}
+
+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_thread_run(void *arg)
+void Acceptor::do_work()
 {
-	int server_sock = int(intptr_t(arg));
 	while (!hupped) {
 		// Since we are non-blocking, we need to wait for the right state first.
 		// Wait up to 50 ms, then check hupped.
@@ -104,5 +145,4 @@ void *acceptor_thread_run(void *arg)
 		// Pick a server, round-robin, and hand over the socket to it.
 		servers->add_client(sock);
 	}
-	return NULL;
 }