Run include-what-you-use.

[cubemap] / acceptor.cpp

diff --git a/acceptor.cpp b/acceptor.cpp
index 87bf47b83ea1b1c09616fbd19c0410c6834bfc20..ecebf7e5b65d74359e6ce6cf857c55fa4920c19b 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -1,12 +1,13 @@
+#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"
@@ -17,9 +18,15 @@ 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);
@@ -54,9 +61,11 @@ 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;