+#include <assert.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include <poll.h>
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
-#include <signal.h>
-#include <errno.h>
-#include <arpa/inet.h>
+#include <string.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
#include <sys/socket.h>
+#include <unistd.h>
#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);
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;
}
-AcceptorThread::AcceptorThread(int server_sock)
- : server_sock(server_sock)
+Acceptor::Acceptor(int server_sock, int port)
+ : server_sock(server_sock),
+ port(port)
{
}
-void AcceptorThread::run()
+Acceptor::Acceptor(const AcceptorProto &serialized)
+ : server_sock(serialized.server_sock()),
+ port(serialized.port())
{
- should_stop = false;
- pthread_create(&worker_thread, NULL, &AcceptorThread::do_work_thunk, this);
}
-void AcceptorThread::stop()
+AcceptorProto Acceptor::serialize() const
{
- should_stop = true;
- pthread_kill(worker_thread, SIGHUP);
- if (pthread_join(worker_thread, NULL) == -1) {
- perror("pthread_join");
- exit(1);
- }
+ AcceptorProto serialized;
+ serialized.set_server_sock(server_sock);
+ serialized.set_port(port);
+ return serialized;
}
-void *AcceptorThread::do_work_thunk(void *arg)
+void Acceptor::close_socket()
{
- AcceptorThread *acceptor_thread = reinterpret_cast<AcceptorThread *>(arg);
- acceptor_thread->do_work();
- return NULL;
+ int ret;
+ do {
+ ret = close(server_sock);
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1) {
+ perror("close");
+ }
}
-void AcceptorThread::do_work()
+void Acceptor::do_work()
{
while (!hupped) {
// Since we are non-blocking, we need to wait for the right state first.