X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FTCPSocketHandle.cc;h=ccc9b78acc8e604c08eb0c3440e01b212ca3ced1;hb=1ad3873b372da6187b1fbc645bf276287d2efb54;hp=2f7f0ad4e44434a172d991fcc8b3ec8a89edeca4;hpb=2c4c9deecc7491fbfc916aeb41074dcb76e8a2c2;p=senf.git

diff --git a/Socket/Protocols/INet/TCPSocketHandle.cc b/Socket/Protocols/INet/TCPSocketHandle.cc
index 2f7f0ad..ccc9b78 100644
--- a/Socket/Protocols/INet/TCPSocketHandle.cc
+++ b/Socket/Protocols/INet/TCPSocketHandle.cc
@@ -32,7 +32,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "TCPSocketHandle.mpp"
 #define prefix_
@@ -46,12 +46,12 @@ 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
-senf::TCPv4SocketProtocol::init_client(INet4Address const & address)
+senf::TCPv4SocketProtocol::init_client(INet4SocketAddress const & address)
     const
 {
     init_client();
@@ -63,19 +63,19 @@ 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(INet4Address const & address,
+prefix_ void senf::TCPv4SocketProtocol::init_server(INet4SocketAddress const & address,
                                                            unsigned backlog)
     const
 {
     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()