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

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index aa097f1..1368d15 100644
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -1,4 +1,5 @@
 #include <cerrno>
+#include <msp/core/systemerror.h>
 #include <msp/strings/format.h>
 #include "datagramsocket.h"
 
@@ -16,14 +17,18 @@ DatagramSocket::DatagramSocket(Family f, int p):
 
 int DatagramSocket::connect(const SockAddr &addr)
 {
-	check_state(false);
-
 	sockaddr_storage sa;
 	socklen_t size = addr.fill_sockaddr(sa);
 
 	int err = ::connect(handle, reinterpret_cast<sockaddr *>(&sa), size);
 	if(err==-1)
-		throw SystemError("Unable to connect", errno);
+	{
+#ifdef WIN32
+		throw system_error("connect", WSAGetLastError());
+#else
+		throw system_error("connect");
+#endif
+	}
 
 	delete peer_addr;
 	peer_addr = addr.copy();
@@ -40,8 +45,6 @@ int DatagramSocket::connect(const SockAddr &addr)
 
 unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &addr_)
 {
-	check_state(false);
-
 	if(size==0)
 		return 0;
 
@@ -54,7 +57,13 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Sendto failed", errno);
+		{
+#ifdef WIN32
+			throw system_error("sendto", WSAGetLastError());
+#else
+			throw system_error("sendto");
+#endif
+		}
 	}
 
 	return ret;
@@ -62,8 +71,6 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
 
 unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
 {
-	check_state(false);
-
 	if(size==0)
 		return 0;
 
@@ -76,7 +83,13 @@ unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&addr_)
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Recvfrom failed", errno);
+		{
+#ifdef WIN32
+			throw system_error("recvfrom", WSAGetLastError());
+#else
+			throw system_error("recvfrom");
+#endif
+		}
 	}
 
 	addr_ = SockAddr::create(addr);