Hide platform specific parts of socket addresses

[libs/net.git] / source / datagramsocket.cpp

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index 7aee3f868d455429c575f77f0d93cf817aaa860f..3f20ba5e242a49f39d47731e97d04ab1674a75e2 100644 (file)
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -3,6 +3,7 @@
 #include <msp/io/handle_private.h>
 #include <msp/strings/format.h>
 #include "datagramsocket.h"
+#include "sockaddr_private.h"
 #include "socket_private.h"
 
 namespace Msp {
@@ -19,10 +20,9 @@ DatagramSocket::DatagramSocket(Family f, int p):
 
 int DatagramSocket::connect(const SockAddr &addr)
 {
-       sockaddr_storage sa;
-       socklen_t size = addr.fill_sockaddr(sa);
+       SockAddr::SysAddr sa = addr.to_sys();
 
-       int err = ::connect(priv->handle, reinterpret_cast<sockaddr *>(&sa), size);
+       int err = ::connect(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), sa.size);
        if(err==-1)
        {
 #ifdef WIN32
@@ -36,24 +36,23 @@ int DatagramSocket::connect(const SockAddr &addr)
        peer_addr = addr.copy();
 
        delete local_addr;
-       size = sizeof(sockaddr_storage);
-       getsockname(priv->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::from_sys(lsa);
 
        connected = true;
 
        return (err==0)?0:1;
 }
 
-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(priv->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)
@@ -71,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(priv->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)
@@ -94,7 +91,7 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
                }
        }
 
-       addr_ = SockAddr::create(addr);
+       from_addr = SockAddr::from_sys(sa);
 
        return ret;
 }