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

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

diff --git a/Socket/Protocols/INet/TCPProtocol.cc b/Socket/Protocols/INet/TCPProtocol.cc
index 6c7337d..c1431e4 100644 (file)
--- a/Socket/Protocols/INet/TCPProtocol.cc
+++ b/Socket/Protocols/INet/TCPProtocol.cc
@@ -44,8 +44,8 @@ prefix_ bool senf::TCPProtocol::nodelay()
 {
     int value;
     socklen_t len (sizeof(value));
-    if (::getsockopt(body().fd(),SOL_TCP,TCP_NODELAY,&value,&len) < 0)
-        throw SystemException(errno);
+    if (::getsockopt(fd(),SOL_TCP,TCP_NODELAY,&value,&len) < 0)
+        throwErrno();
     return value;
 }
 
@@ -53,16 +53,16 @@ prefix_ void senf::TCPProtocol::nodelay(bool value)
     const
 {
     int ivalue (value);
-    if (::setsockopt(body().fd(),SOL_TCP,TCP_NODELAY,&ivalue,sizeof(ivalue)) < 0)
-        throw SystemException(errno);
+    if (::setsockopt(fd(),SOL_TCP,TCP_NODELAY,&ivalue,sizeof(ivalue)) < 0)
+        throwErrno();
 }
 
 prefix_ unsigned senf::TCPProtocol::siocinq()
     const
 {
     int n;
-    if (::ioctl(body().fd(),SIOCINQ,&n) < 0)
-        throw SystemException(errno);
+    if (::ioctl(fd(),SIOCINQ,&n) < 0)
+        throwErrno();
     return n;
 }
 
@@ -70,8 +70,8 @@ prefix_ unsigned senf::TCPProtocol::siocoutq()
     const
 {
     int n;
-    if (::ioctl(body().fd(),SIOCOUTQ,&n) < 0)
-        throw SystemException(errno);
+    if (::ioctl(fd(),SIOCOUTQ,&n) < 0)
+        throwErrno();
     return n;
 }
 
@@ -84,7 +84,7 @@ prefix_ unsigned senf::TCPProtocol::available()
 prefix_ bool senf::TCPProtocol::eof()
     const
 {
-    return body().readable() && available()==0;
+    return fh().readable() && available()==0;
 }