X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatagramsocket.cpp;h=d24ca4e1ec8ec1c10fcd11c3188da874426b053b;hb=21c596567e3b6fd794ed6af73d304ce2bc70e58f;hp=1368d153feb87aa7c574dfc4abb3ebdea01f6314;hpb=e2f4514a4530e0b5c4eb270bab970ab9391b5085;p=libs%2Fnet.git

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index 1368d15..d24ca4e 100644
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -1,26 +1,28 @@
 #include <cerrno>
 #include <msp/core/systemerror.h>
+#include <msp/io/handle_private.h>
 #include <msp/strings/format.h>
 #include "datagramsocket.h"
+#include "sockaddr_private.h"
+#include "socket_private.h"
 
 namespace Msp {
 namespace Net {
 
 DatagramSocket::DatagramSocket(Family f, int p):
-	Socket(f, SOCK_DGRAM, p)
+	ClientSocket(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)
+bool DatagramSocket::connect(const SockAddr &addr)
 {
-	sockaddr_storage sa;
-	socklen_t size = addr.fill_sockaddr(sa);
+	SockAddr::SysAddr sa = addr.to_sys();
 
-	int err = ::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
+	int err = ::connect(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), sa.size);
 	if(err==-1)
 	{
 #ifdef WIN32
@@ -34,24 +36,23 @@ int DatagramSocket::connect(const SockAddr &addr)
 	peer_addr = addr.copy();
 
 	delete local_addr;
-	size = sizeof(sockaddr_storage);
-	getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
-	local_addr = SockAddr::create(sa);
+	SockAddr::SysAddr lsa;
+	getsockname(priv->handle, reinterpret_cast<sockaddr *>(&lsa.addr), &lsa.size);
+	local_addr = SockAddr::new_from_sys(lsa);
 
 	connected = true;
 
-	return (err==0)?0:1;
+	return true;
 }
 
-unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &addr_)
+unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &addr)
 {
 	if(size==0)
 		return 0;
 
-	sockaddr_storage addr;
-	socklen_t addr_len = addr_.fill_sockaddr(addr);
+	SockAddr::SysAddr sa = addr.to_sys();
 
-	int ret = ::sendto(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), addr_len);
+	int ret = ::sendto(priv->handle, buf, size, 0, reinterpret_cast<sockaddr *>(&sa.addr), sa.size);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)
@@ -69,15 +70,13 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
 	return ret;
 }
 
-unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
+unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&from_addr)
 {
 	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);
+	SockAddr::SysAddr sa;
+	int ret = ::recvfrom(priv->handle, buf, size, 0, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)
@@ -92,7 +91,7 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
 		}
 	}
 
-	addr_ = SockAddr::create(addr);
+	from_addr = SockAddr::new_from_sys(sa);
 
 	return ret;
 }