X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fdatagramsocket.cpp;h=7aee3f868d455429c575f77f0d93cf817aaa860f;hp=1368d153feb87aa7c574dfc4abb3ebdea01f6314;hb=4b408e693bcb004ccaa6958610e946cfbeff9465;hpb=5cf15ce8f6b17a47f662eb8f60de619fd6bf7b53 diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp index 1368d15..7aee3f8 100644 --- a/source/datagramsocket.cpp +++ b/source/datagramsocket.cpp @@ -1,7 +1,9 @@ #include #include +#include #include #include "datagramsocket.h" +#include "socket_private.h" namespace Msp { namespace Net { @@ -10,7 +12,7 @@ DatagramSocket::DatagramSocket(Family f, int p): Socket(f, SOCK_DGRAM, p) { #ifdef WIN32 - WSAEventSelect(handle, event, FD_READ|FD_CLOSE); + WSAEventSelect(priv->handle, *priv->event, FD_READ|FD_CLOSE); #endif set_events(IO::P_INPUT); } @@ -20,7 +22,7 @@ int DatagramSocket::connect(const SockAddr &addr) sockaddr_storage sa; socklen_t size = addr.fill_sockaddr(sa); - int err = ::connect(handle, reinterpret_cast(&sa), size); + int err = ::connect(priv->handle, reinterpret_cast(&sa), size); if(err==-1) { #ifdef WIN32 @@ -35,7 +37,7 @@ int DatagramSocket::connect(const SockAddr &addr) delete local_addr; size = sizeof(sockaddr_storage); - getsockname(handle, reinterpret_cast(&sa), &size); + getsockname(priv->handle, reinterpret_cast(&sa), &size); local_addr = SockAddr::create(sa); connected = true; @@ -51,7 +53,7 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr & sockaddr_storage addr; socklen_t addr_len = addr_.fill_sockaddr(addr); - int ret = ::sendto(handle, buf, size, 0, reinterpret_cast(&addr), addr_len); + int ret = ::sendto(priv->handle, buf, size, 0, reinterpret_cast(&addr), addr_len); if(ret<0) { if(errno==EAGAIN) @@ -77,7 +79,7 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_) sockaddr_storage addr; socklen_t addr_len = sizeof(sockaddr_storage); - int ret = ::recvfrom(handle, buf, size, 0, reinterpret_cast(&addr), &addr_len); + int ret = ::recvfrom(priv->handle, buf, size, 0, reinterpret_cast(&addr), &addr_len); if(ret<0) { if(errno==EAGAIN)