diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-17 15:14:22 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-17 15:14:22 -0700 |
| commit | bd749e040d1e86f6a0aa20c64f2d69c1a21e2f24 (patch) | |
| tree | 2d648d7ebe08b5aa865fb8a6071402ccfda70c22 /node/SocketManager.hpp | |
| parent | 7e80d7e551a0a2edc3fa3e6b6eb7379863c3ac04 (diff) | |
| download | infinitytier-bd749e040d1e86f6a0aa20c64f2d69c1a21e2f24.tar.gz infinitytier-bd749e040d1e86f6a0aa20c64f2d69c1a21e2f24.zip | |
Compile fixes.
Diffstat (limited to 'node/SocketManager.hpp')
| -rw-r--r-- | node/SocketManager.hpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/node/SocketManager.hpp b/node/SocketManager.hpp index 5ea11080..3a42897c 100644 --- a/node/SocketManager.hpp +++ b/node/SocketManager.hpp @@ -48,8 +48,6 @@ #include "SharedPtr.hpp" #include "InetAddress.hpp" #include "Socket.hpp" -#include "TcpSocket.hpp" -#include "UdpSocket.hpp" #include "Mutex.hpp" #include "NonCopyable.hpp" #include "Buffer.hpp" @@ -75,7 +73,11 @@ public: * @param arg Second argument to packetHandler() * @throws std::runtime_error Could not bind local port(s) or open socket(s) */ - SocketManager(int localUdpPort,int localTcpPort,void (*packetHandler)(const SharedPtr<Socket> &,void *,const InetAddress &,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> &),void *arg); + SocketManager( + int localUdpPort, + int localTcpPort, + void (*packetHandler)(const SharedPtr<Socket> &,void *,const InetAddress &,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> &), + void *arg); ~SocketManager(); @@ -169,19 +171,15 @@ private: #ifdef __WINDOWS__ SOCKET _whackSendPipe; SOCKET _whackReceivePipe; -#else - int _whackSendPipe; - int _whackReceivePipe; -#endif - Mutex::Lock _whackSendPipe_m; - -#ifdef __WINDOWS__ SOCKET _tcpV4ListenSocket; SOCKET _tcpV6ListenSocket; #else + int _whackSendPipe; + int _whackReceivePipe; int _tcpV4ListenSocket; int _tcpV6ListenSocket; #endif + Mutex _whackSendPipe_m; SharedPtr<Socket> _udpV4Socket; SharedPtr<Socket> _udpV6Socket; |