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

diff --git a/source/socket.cpp b/source/socket.cpp
index dd6c526..7bccec6 100644
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -4,7 +4,10 @@
 #include <sys/socket.h>
 #endif
 #include <iostream>
-#include <msp/strings/formatter.h>
+#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>
 #include "socket.h"
 
@@ -17,7 +20,7 @@ public:
 	WinSockHelper()
 	{
 		WSADATA wsa_data;
-		int err=WSAStartup(0x0002, &wsa_data);
+		int err = WSAStartup(0x0002, &wsa_data);
 		if(err)
 			std::cerr<<"Failed to initialize WinSock: "<<err<<'\n';
 	}
@@ -43,12 +46,14 @@ Socket::Socket(SocketHandle h, const SockAddr &paddr):
 	peer_addr(paddr.copy())
 {
 	sockaddr_storage sa;
-	socklen_t size=sizeof(sockaddr_storage);
+	socklen_t size = sizeof(sockaddr_storage);
 	getsockname(handle, reinterpret_cast<sockaddr *>(&sa), &size);
-	local_addr=SockAddr::create(sa);
+	local_addr = SockAddr::create(sa);
 
 #ifdef WIN32
-	event=CreateEvent(0, false, false, 0);
+	event = CreateEvent(0, false, false, 0);
+#else
+	*event = handle;
 #endif
 }
 
@@ -57,40 +62,47 @@ Socket::Socket(Family af, int type, int proto):
 	local_addr(0),
 	peer_addr(0)
 {
-	handle=socket(af, type, proto);
+	handle = socket(af, type, proto);
 
 #ifdef WIN32
-	event=CreateEvent(0, false, false, 0);
+	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)
 {
-	mode=(mode&~IO::M_NONBLOCK);
+	mode = (mode&~IO::M_NONBLOCK);
 	if(b)
-		mode=(mode|IO::M_NONBLOCK);
+		mode = (mode|IO::M_NONBLOCK);
 
 #ifdef WIN32
-	u_long flag=!b;
+	u_long flag = !b;
 	ioctlsocket(handle, FIONBIO, &flag);
 #else
-	int flags=fcntl(handle, F_GETFL);
+	int flags = fcntl(handle, F_GETFL);
 	fcntl(handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
 #endif
 }
 
-IO::Handle Socket::get_event_handle()
+const IO::Handle &Socket::get_event_handle()
 {
-#ifdef WIN32
 	return event;
-#else
-	return handle;
-#endif
 }
 
 
@@ -99,49 +111,20 @@ void Socket::bind(const SockAddr &addr)
 	check_state(false);
 
 	sockaddr_storage sa;
-	unsigned size=addr.fill_sockaddr(sa);
+	unsigned size = addr.fill_sockaddr(sa);
 
-	int err=::bind(handle, reinterpret_cast<sockaddr *>(&sa), size);
+	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();
-}
-
-/**
-Closes the socket.  Most operations on the socket will throw an exception after
-this.
-*/
-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;
+	local_addr = addr.copy();
 }
 
 void Socket::set_timeout(const Time::TimeDelta &timeout)
 {
 #ifndef WIN32
-	timeval tv;
-	timeout.fill_timeval(tv);
+	timeval tv = Time::rawtime_to_timeval(timeout.raw());
 	set_option(SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(timeval));
 	set_option(SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(timeval));
 #else
@@ -154,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)
@@ -198,13 +179,13 @@ unsigned Socket::do_write(const char *buf, unsigned size)
 	if(size==0)
 		return 0;
 
-	int ret=::send(handle, buf, size, 0);
+	int ret = ::send(handle, buf, size, 0);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Writing to socket failed", errno);
+			throw system_error("send");
 	}
 
 	return ret;
@@ -217,17 +198,17 @@ unsigned Socket::do_read(char *buf, unsigned size)
 	if(size==0)
 		return 0;
 
-	int ret=::recv(handle, buf, size, 0);
+	int ret = ::recv(handle, buf, size, 0);
 	if(ret<0)
 	{
 		if(errno==EAGAIN)
 			return 0;
 		else
-			throw SystemError("Reading from socket failed", errno);
+			throw system_error("recv");
 	}
 	else if(ret==0 && !eof_flag)
 	{
-		eof_flag=true;
+		eof_flag = true;
 		signal_end_of_file.emit();
 		set_events(IO::P_NONE);
 	}