X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatagramsocket.cpp;h=a1b1c9ec7c8cd49ea3bc167c84093a4d8aff5c40;hb=a4f75be32827b00d9de9d8a68855fec2f5157a10;hp=9779bfeb268acb4722c3f21fb85b251405856c1c;hpb=3970ee9cf7978c462390d49e083deb740d71c6fe;p=libs%2Fnet.git

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index 9779bfe..a1b1c9e 100644
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspnet
-Copyright © 2008  Mikkosoft Productions, Mikko Rasa
+Copyright © 2008, 2011  Mikkosoft Productions, Mikko Rasa
 Distributed under the LGPL
 */
 
@@ -14,16 +14,21 @@ 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<sockaddr *>(&sa), size);
 	if(err==-1)
 		throw SystemError("Unable to connect", errno);
 
@@ -31,8 +36,8 @@ int DatagramSocket::connect(const SockAddr &addr)
 	peer_addr=addr.copy();
 
 	delete local_addr;
-	size=sizeof(sockaddr);
-	getsockname(handle, &sa, &size);
+	size=sizeof(sockaddr_storage);
+	getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
 	local_addr=SockAddr::create(sa);
 
 	connected=true;
@@ -47,10 +52,10 @@ 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<sockaddr *>(&addr), addr_len);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)
@@ -69,10 +74,10 @@ 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<sockaddr *>(&addr), &addr_len);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)
@@ -86,10 +91,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