X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsocket.cpp;h=2bfdecc5b07794976ddaab3d5d528081c492d9a7;hb=6489612c788dd57721fc181ff26a981b35668d1e;hp=8fa910cbd5a97eb52479a0e18192f18a6425633b;hpb=bdd968802348fae7a7a407616cb3744e4877601a;p=libs%2Fnet.git

diff --git a/source/socket.cpp b/source/socket.cpp
index 8fa910c..2bfdecc 100644
--- a/source/socket.cpp
+++ b/source/socket.cpp
@@ -9,6 +9,7 @@
 #include <msp/strings/format.h>
 #include <msp/time/rawtime_private.h>
 #include <msp/time/units.h>
+#include "sockaddr_private.h"
 #include "socket.h"
 #include "socket_private.h"
 
@@ -40,18 +41,15 @@ WinSockHelper wsh;
 namespace Msp {
 namespace Net {
 
-Socket::Socket(const Private &p, const SockAddr &paddr):
+Socket::Socket(const Private &p):
 	priv(new Private),
-	connected(true),
-	local_addr(0),
-	peer_addr(paddr.copy())
+	local_addr(0)
 {
 	priv->handle = p.handle;
 
-	sockaddr_storage sa;
-	socklen_t size = sizeof(sockaddr_storage);
-	getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa), &size);
-	local_addr = SockAddr::create(sa);
+	SockAddr::SysAddr sa;
+	getsockname(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size);
+	local_addr = SockAddr::from_sys(sa);
 
 #ifdef WIN32
 	*priv->event = CreateEvent(0, false, false, 0);
@@ -62,9 +60,7 @@ Socket::Socket(const Private &p, const SockAddr &paddr):
 
 Socket::Socket(Family af, int type, int proto):
 	priv(new Private),
-	connected(false),
-	local_addr(0),
-	peer_addr(0)
+	local_addr(0)
 {
 	priv->handle = socket(family_to_sys(af), type, proto);
 
@@ -77,7 +73,6 @@ Socket::Socket(Family af, int type, int proto):
 
 Socket::~Socket()
 {
-	signal_flush_required.emit();
 #ifdef WIN32
 	closesocket(priv->handle);
 	CloseHandle(*priv->event);
@@ -86,7 +81,6 @@ Socket::~Socket()
 #endif
 
 	delete local_addr;
-	delete peer_addr;
 	delete priv;
 }
 
@@ -113,10 +107,9 @@ const IO::Handle &Socket::get_event_handle()
 
 void Socket::bind(const SockAddr &addr)
 {
-	sockaddr_storage sa;
-	unsigned size = addr.fill_sockaddr(sa);
+	SockAddr::SysAddr sa = addr.to_sys();
 
-	int err = ::bind(priv->handle, reinterpret_cast<sockaddr *>(&sa), size);
+	int err = ::bind(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), sa.size);
 	if(err==-1)
 		throw system_error("bind");
 
@@ -124,6 +117,13 @@ void Socket::bind(const SockAddr &addr)
 	local_addr = addr.copy();
 }
 
+const SockAddr &Socket::get_local_address() const
+{
+	if(local_addr==0)
+		throw bad_socket_state("not bound");
+	return *local_addr;
+}
+
 void Socket::set_timeout(const Time::TimeDelta &timeout)
 {
 #ifndef WIN32
@@ -137,20 +137,6 @@ void Socket::set_timeout(const Time::TimeDelta &timeout)
 #endif
 }
 
-const SockAddr &Socket::get_local_address() const
-{
-	if(local_addr==0)
-		throw bad_socket_state("not bound");
-	return *local_addr;
-}
-
-const SockAddr &Socket::get_peer_address() const
-{
-	if(peer_addr==0)
-		throw bad_socket_state("not connected");
-	return *peer_addr;
-}
-
 int Socket::set_option(int level, int optname, const void *optval, socklen_t optlen)
 {
 #ifdef WIN32
@@ -169,52 +155,5 @@ int Socket::get_option(int level, int optname, void *optval, socklen_t *optlen)
 #endif
 }
 
-unsigned Socket::do_write(const char *buf, unsigned size)
-{
-	if(!connected)
-		throw bad_socket_state("not connected");
-
-	if(size==0)
-		return 0;
-
-	int ret = ::send(priv->handle, buf, size, 0);
-	if(ret<0)
-	{
-		if(errno==EAGAIN)
-			return 0;
-		else
-			throw system_error("send");
-	}
-
-	return ret;
-}
-
-unsigned Socket::do_read(char *buf, unsigned size)
-{
-	if(!connected)
-		throw bad_socket_state("not connected");
-
-
-	if(size==0)
-		return 0;
-
-	int ret = ::recv(priv->handle, buf, size, 0);
-	if(ret<0)
-	{
-		if(errno==EAGAIN)
-			return 0;
-		else
-			throw system_error("recv");
-	}
-	else if(ret==0 && !eof_flag)
-	{
-		eof_flag = true;
-		signal_end_of_file.emit();
-		set_events(IO::P_NONE);
-	}
-
-	return ret;
-}
-
 } // namespace Net
 } // namespace Msp