X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatagramsocket.cpp;h=43b86615b2ee2e631cef68be878c69299f73701e;hb=2aab4004e71a2e5c773289e0be5e58aec6a8d339;hp=1394ffa59db669965f94564a777385ac85e91ce6;hpb=f59eded7c3e162bbdfc6db424c9badc730017698;p=libs%2Fnet.git diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp index 1394ffa..43b8661 100644 --- a/source/datagramsocket.cpp +++ b/source/datagramsocket.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspnet -Copyright © 2008 Mikkosoft Productions, Mikko Rasa -Distributed under the LGPL -*/ - #include #include #include "datagramsocket.h" @@ -14,25 +7,30 @@ namespace Net { DatagramSocket::DatagramSocket(Family f, int p): Socket(f, SOCK_DGRAM, p) -{ } +{ +#ifdef WIN32 + WSAEventSelect(handle, event, FD_READ|FD_CLOSE); +#endif + set_events(IO::P_INPUT); +} int DatagramSocket::connect(const SockAddr &addr) { check_state(false); - sockaddr sa; + sockaddr_storage sa; socklen_t size=addr.fill_sockaddr(sa); - int err=::connect(handle, &sa, size); + int err=::connect(handle, reinterpret_cast(&sa), size); if(err==-1) - throw Exception(format("Unable to connect: %s", strerror(errno))); + throw SystemError("Unable to connect", errno); delete peer_addr; peer_addr=addr.copy(); delete local_addr; - size=sizeof(sockaddr); - getsockname(handle, &sa, &size); + size=sizeof(sockaddr_storage); + getsockname(handle, reinterpret_cast(&sa), &size); local_addr=SockAddr::create(sa); connected=true; @@ -47,16 +45,16 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr & if(size==0) return 0; - 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(&addr), addr_len); if(ret<0) { if(errno==EAGAIN) return 0; else - throw Exception(format("Sendto failed: %s", strerror(errno))); + throw SystemError("Sendto failed", errno); } return ret; @@ -69,16 +67,16 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_) 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(&addr), &addr_len); if(ret<0) { if(errno==EAGAIN) return 0; else - throw Exception(format("Recvfrom failed: %s", strerror(errno))); + throw SystemError("Recvfrom failed", errno); } addr_=SockAddr::create(addr); @@ -86,10 +84,5 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_) return ret; } -IO::PollEvent DatagramSocket::get_initial_events() const -{ - return IO::P_INPUT; -} - } // namespace Net } // namespace Msp