-/* $Id$
-
-This file is part of libmspnet
-Copyright © 2008 Mikkosoft Productions, Mikko Rasa
-Distributed under the LGPL
-*/
-
-#include <errno.h>
-#include <msp/strings/formatter.h>
+#include <cerrno>
+#include <msp/strings/format.h>
#include "datagramsocket.h"
namespace Msp {
{
check_state(false);
- sockaddr sa;
- socklen_t size=addr.fill_sockaddr(sa);
+ sockaddr_storage sa;
+ socklen_t size = addr.fill_sockaddr(sa);
- int err=::connect(handle, &sa, size);
+ int err = ::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
if(err==-1)
throw SystemError("Unable to connect", errno);
delete peer_addr;
- peer_addr=addr.copy();
+ peer_addr = addr.copy();
delete local_addr;
- size=sizeof(sockaddr);
- getsockname(handle, &sa, &size);
- local_addr=SockAddr::create(sa);
+ size = sizeof(sockaddr_storage);
+ getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
+ local_addr = SockAddr::create(sa);
- connected=true;
+ connected = true;
return (err==0)?0:1;
}
if(size==0)
return 0;
- sockaddr addr;
- socklen_t addr_len=addr_.fill_sockaddr(addr);
+ sockaddr_storage addr;
+ socklen_t addr_len = addr_.fill_sockaddr(addr);
- int ret=::sendto(handle, buf, size, 0, &addr, addr_len);
+ int ret = ::sendto(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), addr_len);
if(ret<0)
{
if(errno==EAGAIN)
if(size==0)
return 0;
- sockaddr addr;
- socklen_t addr_len=sizeof(sockaddr);
+ sockaddr_storage addr;
+ socklen_t addr_len = sizeof(sockaddr_storage);
- int ret=::recvfrom(handle, buf, size, 0, &addr, &addr_len);
+ int ret = ::recvfrom(handle, buf, size, 0, reinterpret_cast<sockaddr *>(&addr), &addr_len);
if(ret<0)
{
if(errno==EAGAIN)
throw SystemError("Recvfrom failed", errno);
}
- addr_=SockAddr::create(addr);
+ addr_ = SockAddr::create(addr);
return ret;
}