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

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

diff --git a/Socket/Protocols/INet/INetProtocol.cc b/Socket/Protocols/INet/INetProtocol.cc
index fff10c0..6ddc307 100644 (file)
--- a/Socket/Protocols/INet/INetProtocol.cc
+++ b/Socket/Protocols/INet/INetProtocol.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include "Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 
 //#include "INetProtocol.mpp"
 #define prefix_
@@ -38,18 +38,18 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::IPv4Protocol
 
-prefix_ void senf::IPv4Protocol::connect(INet4Address const & address)
+prefix_ void senf::IPv4Protocol::connect(INet4SocketAddress const & address)
     const
 {
-    if (::connect(body().fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
-        throw SystemException(errno);
+    if (::connect(fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
+        throwErrno();
 }
 
-prefix_ void senf::IPv4Protocol::bind(INet4Address const & address)
+prefix_ void senf::IPv4Protocol::bind(INet4SocketAddress const & address)
     const
 {
-    if (::bind(body().fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
-        throw SystemException(errno);
+    if (::bind(fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
+        throwErrno();
 }
 
 
@@ -59,15 +59,15 @@ prefix_ void senf::IPv4Protocol::bind(INet4Address const & address)
 prefix_ void senf::IPv6Protocol::connect(INet6SocketAddress const & address)
     const
 {
-    if (::connect(body().fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
-        throw SystemException(errno);
+    if (::connect(fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
+        throwErrno();
 }
 
 prefix_ void senf::IPv6Protocol::bind(INet6SocketAddress const & address)
     const
 {
-    if (::bind(body().fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
-        throw SystemException(errno);
+    if (::bind(fd(),address.sockaddr_p(), address.sockaddr_len()) < 0)
+        throwErrno();
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////