X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatagramsocket.cpp;h=7aee3f868d455429c575f77f0d93cf817aaa860f;hb=4b408e693bcb004ccaa6958610e946cfbeff9465;hp=e15a1d143c0281cc9686abd9b4e36a1da97a168c;hpb=4696a776e2875697ea0d6a733609dd9c37918971;p=libs%2Fnet.git

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index e15a1d1..7aee3f8 100644
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -1,7 +1,9 @@
 #include <cerrno>
 #include <msp/core/systemerror.h>
+#include <msp/io/handle_private.h>
 #include <msp/strings/format.h>
 #include "datagramsocket.h"
+#include "socket_private.h"
 
 namespace Msp {
 namespace Net {
@@ -10,19 +12,17 @@ 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);
 }
 
 int DatagramSocket::connect(const SockAddr &addr)
 {
-	check_state(false);
-
 	sockaddr_storage sa;
 	socklen_t size = addr.fill_sockaddr(sa);
 
-	int err = ::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
+	int err = ::connect(priv->handle, reinterpret_cast<sockaddr *>(&sa), size);
 	if(err==-1)
 	{
 #ifdef WIN32
@@ -37,7 +37,7 @@ int DatagramSocket::connect(const SockAddr &addr)
 
 	delete local_addr;
 	size = sizeof(sockaddr_storage);
-	getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
+	getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa), &size);
 	local_addr = SockAddr::create(sa);
 
 	connected = true;
@@ -47,15 +47,13 @@ int DatagramSocket::connect(const SockAddr &addr)
 
 unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &addr_)
 {
-	check_state(false);
-
 	if(size==0)
 		return 0;
 
 	sockaddr_storage addr;
 	socklen_t addr_len = addr_.fill_sockaddr(addr);
 
-	int ret = ::sendto(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), addr_len);
+	int ret = ::sendto(priv->handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), addr_len);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)
@@ -75,15 +73,13 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
 
 unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
 {
-	check_state(false);
-
 	if(size==0)
 		return 0;
 
 	sockaddr_storage addr;
 	socklen_t addr_len = sizeof(sockaddr_storage);
 
-	int ret = ::recvfrom(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), &addr_len);
+	int ret = ::recvfrom(priv->handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), &addr_len);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)