Coding style consistency fix.

[cubemap] / acceptor.h

diff --git a/acceptor.h b/acceptor.h
index caa46474ce48d83185244cc2e977c155ce882e1b..fe62c31396d119ea97addc6bdafae262fef8d452 100644 (file)
--- a/acceptor.h
+++ b/acceptor.h
@@ -1,17 +1,26 @@
 #ifndef _ACCEPTOR_H
 #define _ACCEPTOR_H
 
+#include <netinet/in.h>
+
 #include "thread.h"
 
-int create_server_socket(int port);
+enum SocketType {
+       TCP_SOCKET,
+       UDP_SOCKET,
+};
+int create_server_socket(const sockaddr_in6 &addr, SocketType socket_type);
 
 class AcceptorProto;
 
+sockaddr_in6 create_any_address(int port);
+sockaddr_in6 extract_address_from_acceptor_proto(const AcceptorProto &proto);
+
 // A thread that accepts new connections on a given socket,
 // and hands them off to the server pool.
 class Acceptor : public Thread {
 public:
-       Acceptor(int server_sock, int port);
+       Acceptor(int server_sock, const sockaddr_in6 &addr);
 
        // Serialization/deserialization.
        Acceptor(const AcceptorProto &serialized);
@@ -22,7 +31,8 @@ public:
 private:
        virtual void do_work();
 
-       int server_sock, port;
+       int server_sock;
+       sockaddr_in6 addr;
 };
 
 #endif  // !defined(_ACCEPTOR_H)