X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fstreamserversocket.cpp;h=9b583a141da552d420908826357528eb5b5b7cce;hb=32713c673d335f0d4667005a9e6f658e8a616e8f;hp=bbf91bccd9b9798f311151c198b8b8ccd42e3a4c;hpb=debe1004676d5431e571d9c4361072661dcc88c4;p=libs%2Fnet.git

diff --git a/source/net/streamserversocket.cpp b/source/net/streamserversocket.cpp
index bbf91bc..9b583a1 100644
--- a/source/net/streamserversocket.cpp
+++ b/source/net/streamserversocket.cpp
@@ -1,4 +1,4 @@
-#include <cerrno>
+#include "platform_api.h"
 #include <msp/core/refptr.h>
 #include <msp/core/systemerror.h>
 #include <msp/io/handle_private.h>
@@ -20,16 +20,16 @@ StreamServerSocket::StreamServerSocket(Family af, int proto):
 
 void StreamServerSocket::listen(const SockAddr &addr, unsigned backlog)
 {
+	if(listening)
+		throw bad_socket_state("already listening");
+
 	bind(addr);
 
 	int err = ::listen(priv->handle, backlog);
 	if(err==-1)
 		throw system_error("listen");
 
-#ifdef WIN32
-	WSAEventSelect(priv->handle, *priv->event, FD_ACCEPT);
-#endif
-	set_events(IO::P_INPUT);
+	set_socket_events(S_ACCEPT);
 
 	listening = true;
 }
@@ -41,7 +41,7 @@ StreamSocket *StreamServerSocket::accept()
 
 	SockAddr::SysAddr sa;
 	Private new_p;
-	new_p.handle = ::accept(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size);
+	new_p.handle = check_sys_error(::accept(priv->handle, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size), "accept");
 
 	RefPtr<SockAddr> paddr = SockAddr::new_from_sys(sa);
 	return new StreamSocket(new_p, *paddr);