X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocols%2FINet%2FTCPSocketHandle.cc;h=5afe60c0bc5fa9685238024f02aab81472670f57;hb=6f50bf49e282c0528f51faa0a245bbfa2b867399;hp=082529500025e394573507899fc9b836d75db897;hpb=34378cabd0ef59515f60b8e535d50fd5488c84e2;p=senf.git

diff --git a/Socket/Protocols/INet/TCPSocketHandle.cc b/Socket/Protocols/INet/TCPSocketHandle.cc
index 0825295..5afe60c 100644
--- a/Socket/Protocols/INet/TCPSocketHandle.cc
+++ b/Socket/Protocols/INet/TCPSocketHandle.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ prefix_ void senf::TCPv4SocketProtocol::init_client()
     int sock = ::socket(PF_INET,SOCK_STREAM,0);
     if (sock < 0)
         throwErrno();
-    body().fd(sock);
+    fd(sock);
 }
 
 prefix_ void
@@ -55,7 +55,7 @@ senf::TCPv4SocketProtocol::init_client(INet4SocketAddress const & address)
     const
 {
     init_client();
-    connect(address);
+    clientHandle().connect(address);
 }
 
 prefix_ void senf::TCPv4SocketProtocol::init_server()
@@ -64,7 +64,7 @@ prefix_ void senf::TCPv4SocketProtocol::init_server()
     int sock = ::socket(PF_INET,SOCK_STREAM,0);
     if (sock < 0)
         throwErrno();
-    body().fd(sock);
+    fd(sock);
 }
 
 prefix_ void senf::TCPv4SocketProtocol::init_server(INet4SocketAddress const & address,
@@ -72,18 +72,12 @@ prefix_ void senf::TCPv4SocketProtocol::init_server(INet4SocketAddress const & a
     const
 {
     init_server();
-    bind(address);
+    serverHandle().bind(address);
     reuseaddr(true);
-    if (::listen(body().fd(),backlog) < 0)
+    if (::listen(fd(),backlog) < 0)
         throwErrno();
 }
 
-prefix_ std::auto_ptr<senf::SocketProtocol> senf::TCPv4SocketProtocol::clone()
-    const
-{
-    return std::auto_ptr<SocketProtocol>(new TCPv4SocketProtocol());
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // senf::TCPv6SocketProtocol::
 
@@ -93,7 +87,7 @@ prefix_ void senf::TCPv6SocketProtocol::init_client()
     int sock = ::socket(PF_INET6,SOCK_STREAM,0);
     if (sock < 0)
         throwErrno();
-    body().fd(sock);
+    fd(sock);
 }
 
 prefix_ void
@@ -101,7 +95,7 @@ senf::TCPv6SocketProtocol::init_client(INet6SocketAddress const & address)
     const
 {
     init_client();
-    connect(address);
+    clientHandle().connect(address);
 }
 
 prefix_ void senf::TCPv6SocketProtocol::init_server()
@@ -110,7 +104,7 @@ prefix_ void senf::TCPv6SocketProtocol::init_server()
     int sock = ::socket(PF_INET6,SOCK_STREAM,0);
     if (sock < 0)
         throwErrno();
-    body().fd(sock);
+    fd(sock);
 }
 
 prefix_ void senf::TCPv6SocketProtocol::init_server(INet6SocketAddress const & address,
@@ -118,18 +112,12 @@ prefix_ void senf::TCPv6SocketProtocol::init_server(INet6SocketAddress const & a
     const
 {
     init_server();
-    bind(address);
+    serverHandle().bind(address);
     reuseaddr(true);
-    if (::listen(body().fd(),backlog) < 0)
+    if (::listen(fd(),backlog) < 0)
         throwErrno();
 }
 
-prefix_ std::auto_ptr<senf::SocketProtocol> senf::TCPv6SocketProtocol::clone()
-    const
-{
-    return std::auto_ptr<SocketProtocol>(new TCPv6SocketProtocol());
-}
-
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "TCPSocketHandle.mpp"