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/UdpSocket.hpp | |
| parent | 7e80d7e551a0a2edc3fa3e6b6eb7379863c3ac04 (diff) | |
| download | infinitytier-bd749e040d1e86f6a0aa20c64f2d69c1a21e2f24.tar.gz infinitytier-bd749e040d1e86f6a0aa20c64f2d69c1a21e2f24.zip | |
Compile fixes.
Diffstat (limited to 'node/UdpSocket.hpp')
| -rw-r--r-- | node/UdpSocket.hpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/node/UdpSocket.hpp b/node/UdpSocket.hpp index 9a6cf68b..5e0f961a 100644 --- a/node/UdpSocket.hpp +++ b/node/UdpSocket.hpp @@ -28,7 +28,7 @@ #ifndef ZT_UDPSOCKET_HPP #define ZT_UDPSOCKET_HPP -#include "Socket.hpp" +//#include "Socket.hpp" namespace ZeroTier { @@ -37,7 +37,7 @@ class SocketManager; /** * Locally bound UDP socket */ -class TcpSocket : public Socket +class UdpSocket : public Socket { friend class SharedPtr<Socket>; friend class SocketManager; @@ -45,7 +45,6 @@ class TcpSocket : public Socket public: virtual ~UdpSocket(); - virtual bool isOpen() const; virtual bool send(const InetAddress &to,const void *msg,unsigned int msglen); /** @@ -60,20 +59,17 @@ public: bool sendWithHopLimit(const InetAddress &to,const void *msg,unsigned int msglen,int hopLimit); protected: - virtual bool notifyAvailableForRead(const SharedPtr<Socket> &self,SocketManager *sm); - virtual bool notifyAvailableForWrite(const SharedPtr<Socket> &self,SocketManager *sm); - -private: #ifdef __WINDOWS__ - UdpSocket(Type t,SOCKET sock) : + UdpSocket(Type t,SOCKET s) : #else - UdpSocket(Type t,int sock) : + UdpSocket(Type t,int s) : #endif - Socket(t,sock) - { - } + Socket(t,s) {} + + virtual bool notifyAvailableForRead(const SharedPtr<Socket> &self,SocketManager *sm); + virtual bool notifyAvailableForWrite(const SharedPtr<Socket> &self,SocketManager *sm); }; -}; // namespace ZeroTier +} // namespace ZeroTier #endif |
