X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsocket.cpp;h=7bccec6de1303997f07883898ea947b99fd12ba4;hb=bc7f7210f6963c7bd23cce9cea3d3e82a2968f98;hp=a4675f593b6bc95ed9e0d4ad40f442e5bcf78ee1;hpb=12b93b4f1655bf9c26f73e67cf78b86eeb1eaa97;p=libs%2Fnet.git

diff --git a/source/socket.cpp b/source/socket.cpp
index a4675f5..7bccec6 100644
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -4,6 +4,8 @@
 #include <sys/socket.h>
 #endif
 #include <iostream>
+#include <msp/core/systemerror.h>
+#include <msp/io/handle_private.h>
 #include <msp/strings/format.h>
 #include <msp/time/rawtime_private.h>
 #include <msp/time/units.h>
@@ -50,6 +52,8 @@ Socket::Socket(SocketHandle h, const SockAddr &paddr):
 
 #ifdef WIN32
 	event = CreateEvent(0, false, false, 0);
+#else
+	*event = handle;
 #endif
 }
 
@@ -62,12 +66,23 @@ Socket::Socket(Family af, int type, int proto):
 
 #ifdef WIN32
 	event = CreateEvent(0, false, false, 0);
+#else
+	*event = handle;
 #endif
 }
 
 Socket::~Socket()
 {
-	close();
+	signal_flush_required.emit();
+#ifdef WIN32
+	closesocket(handle);
+	CloseHandle(event);
+#else
+	::close(handle);
+#endif
+
+	delete local_addr;
+	delete peer_addr;
 }
 
 void Socket::set_block(bool b)
@@ -85,13 +100,9 @@ void Socket::set_block(bool b)
 #endif
 }
 
-IO::Handle Socket::get_event_handle()
+const IO::Handle &Socket::get_event_handle()
 {
-#ifdef WIN32
 	return event;
-#else
-	return handle;
-#endif
 }
 
 
@@ -104,36 +115,12 @@ void Socket::bind(const SockAddr &addr)
 
 	int err = ::bind(handle, reinterpret_cast<sockaddr *>(&sa), size);
 	if(err==-1)
-		throw SystemError("Unable to bind", errno);
+		throw system_error("bind");
 
 	delete local_addr;
 	local_addr = addr.copy();
 }
 
-void Socket::close()
-{
-	if(handle==MSP_NET_INVALID_SOCKET_HANDLE)
-		return;
-
-	set_events(IO::P_NONE);
-
-	signal_flush_required.emit();
-#ifdef WIN32
-	closesocket(handle);
-	CloseHandle(event);
-#else
-	::close(handle);
-#endif
-	handle = MSP_NET_INVALID_SOCKET_HANDLE;
-	connected = false;
-	signal_closed.emit();
-
-	delete local_addr;
-	local_addr = 0;
-	delete peer_addr;
-	peer_addr = 0;
-}
-
 void Socket::set_timeout(const Time::TimeDelta &timeout)
 {
 #ifndef WIN32
@@ -150,23 +137,21 @@ void Socket::set_timeout(const Time::TimeDelta &timeout)
 const SockAddr &Socket::get_local_address() const
 {
 	if(local_addr==0)
-		throw InvalidState("Local address not set");
+		throw bad_socket_state("not bound");
 	return *local_addr;
 }
 
 const SockAddr &Socket::get_peer_address() const
 {
 	if(peer_addr==0)
-		throw InvalidState("Peer address not set");
+		throw bad_socket_state("not connected");
 	return *peer_addr;
 }
 
 void Socket::check_state(bool conn) const
 {
-	if(handle==MSP_NET_INVALID_SOCKET_HANDLE)
-		throw Exception("Socket is closed");
 	if(conn && !connected)
-		throw Exception("Socket is not connected");
+		throw bad_socket_state("not connected");
 }
 
 int Socket::set_option(int level, int optname, const void *optval, socklen_t optlen)
@@ -200,7 +185,7 @@ unsigned Socket::do_write(const char *buf, unsigned size)
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Writing to socket failed", errno);
+			throw system_error("send");
 	}
 
 	return ret;
@@ -219,7 +204,7 @@ unsigned Socket::do_read(char *buf, unsigned size)
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Reading from socket failed", errno);
+			throw system_error("recv");
 	}
 	else if(ret==0 && !eof_flag)
 	{