Support UDP input. Also fix some issues with socket closing.

[cubemap] / acceptor.cpp

diff --git a/acceptor.cpp b/acceptor.cpp
index 87bf47b83ea1b1c09616fbd19c0410c6834bfc20..fbc5b04390d06929e0b53493e0e8f8fe55350c86 100644 (file)
--- a/acceptor.cpp
+++ b/acceptor.cpp
@@ -17,9 +17,15 @@ using namespace std;
 extern ServerPool *servers;
 extern volatile bool hupped;
 
 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);
        if (server_sock == -1) {
                perror("socket");
                exit(1);


@@ -54,9 +60,11 @@ int create_server_socket(int port)
                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;
        }
 
        return server_sock;