Merged revisions 570-575,577-578 via svnmerge from

[senf.git] / Socket / Protocols / INet / TCPSocketHandle.cc

diff --git a/Socket/Protocols/INet/TCPSocketHandle.cc b/Socket/Protocols/INet/TCPSocketHandle.cc
index f68db94..ccc9b78 100644 (file)
--- a/Socket/Protocols/INet/TCPSocketHandle.cc
+++ b/Socket/Protocols/INet/TCPSocketHandle.cc
@@ -46,8 +46,8 @@ prefix_ void senf::TCPv4SocketProtocol::init_client()
 {
     int sock = ::socket(PF_INET,SOCK_STREAM,0);
     if (sock < 0)
-        throw SystemException(errno);
-    body().fd(sock);
+        throwErrno();
+    fd(sock);
 }
 
 prefix_ void
@@ -63,8 +63,8 @@ prefix_ void senf::TCPv4SocketProtocol::init_server()
 {
     int sock = ::socket(PF_INET,SOCK_STREAM,0);
     if (sock < 0)
-        throw SystemException(errno);
-    body().fd(sock);
+        throwErrno();
+    fd(sock);
 }
 
 prefix_ void senf::TCPv4SocketProtocol::init_server(INet4SocketAddress const & address,
@@ -74,8 +74,8 @@ prefix_ void senf::TCPv4SocketProtocol::init_server(INet4SocketAddress const & a
     init_server();
     bind(address);
     reuseaddr(true);
-    if (::listen(body().fd(),backlog) < 0)
-        throw SystemException(errno);
+    if (::listen(fd(),backlog) < 0)
+        throwErrno();
 }
 
 prefix_ std::auto_ptr<senf::SocketProtocol> senf::TCPv4SocketProtocol::clone()
@@ -92,8 +92,8 @@ prefix_ void senf::TCPv6SocketProtocol::init_client()
 {
     int sock = ::socket(PF_INET6,SOCK_STREAM,0);
     if (sock < 0)
-        throw SystemException(errno);
-    body().fd(sock);
+        throwErrno();
+    fd(sock);
 }
 
 prefix_ void
@@ -109,8 +109,8 @@ prefix_ void senf::TCPv6SocketProtocol::init_server()
 {
     int sock = ::socket(PF_INET6,SOCK_STREAM,0);
     if (sock < 0)
-        throw SystemException(errno);
-    body().fd(sock);
+        throwErrno();
+    fd(sock);
 }
 
 prefix_ void senf::TCPv6SocketProtocol::init_server(INet6SocketAddress const & address,
@@ -120,8 +120,8 @@ prefix_ void senf::TCPv6SocketProtocol::init_server(INet6SocketAddress const & a
     init_server();
     bind(address);
     reuseaddr(true);
-    if (::listen(body().fd(),backlog) < 0)
-        throw SystemException(errno);
+    if (::listen(fd(),backlog) < 0)
+        throwErrno();
 }
 
 prefix_ std::auto_ptr<senf::SocketProtocol> senf::TCPv6SocketProtocol::clone()