X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatagramsocket.cpp;h=e15a1d143c0281cc9686abd9b4e36a1da97a168c;hb=6102d830138013216241b6723527246764103fa0;hp=714b4d58df67a1d8af548bdd957716350644b5a2;hpb=a81c41acd873cda7f40bca634782230d9e57dc4f;p=libs%2Fnet.git

diff --git a/source/datagramsocket.cpp b/source/datagramsocket.cpp
index 714b4d5..e15a1d1 100644
--- a/source/datagramsocket.cpp
+++ b/source/datagramsocket.cpp
@@ -1,5 +1,6 @@
-#include <errno.h>
-#include <msp/strings/formatter.h>
+#include <cerrno>
+#include <msp/core/systemerror.h>
+#include <msp/strings/format.h>
 #include "datagramsocket.h"
 
 namespace Msp {
@@ -23,7 +24,13 @@ int DatagramSocket::connect(const SockAddr &addr)
 
 	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();
@@ -54,7 +61,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;
@@ -76,7 +89,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);