X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.cti;h=9a5cd7b28a759463e9dd4195258ea9fb79b06615;hb=6f50bf49e282c0528f51faa0a245bbfa2b867399;hp=f584a18e0b08bb5abd1093173fa3d8aea98debd4;hpb=afa15c46e79de0f407d41fda78b6e8d08700caa8;p=senf.git

diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti
index f584a18..9a5cd7b 100644
--- a/Socket/ClientSocketHandle.cti
+++ b/Socket/ClientSocketHandle.cti
@@ -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
@@ -68,13 +68,13 @@ prefix_ typename boost::range_const_iterator<ForwardReadableRange>::type
 senf::detail::WriteRange<Handle, ForwardReadableRange, true>::
 write(Handle & handle, ForwardReadableRange & range)
 {
-    typename boost::range_const_iterator<ForwardReadableRange>::type const i 
+    typename boost::range_const_iterator<ForwardReadableRange>::type i 
         (boost::const_begin(range));
     char const * const ic (reinterpret_cast<char const *>(storage_iterator(i)));
-    return i + (handle.write(ic,
-                             reinterpret_cast<char const *>(
-                                 storage_iterator(boost::const_end(range))))
-                - ic);
+    std::advance(i, handle.write(ic,
+                                 reinterpret_cast<char const *>(
+                                     storage_iterator(boost::const_end(range)))) - ic);
+    return i;
 }
 
 template <class Handle, class ForwardReadableRange>
@@ -82,14 +82,13 @@ prefix_ typename boost::range_const_iterator<ForwardReadableRange>::type
 senf::detail::WriteRange<Handle, ForwardReadableRange, true>::
 writeto(Handle & handle, ForwardReadableRange & range, typename Handle::Address const & addr)
 {
-    typename boost::range_const_iterator<ForwardReadableRange>::type const i 
+    typename boost::range_const_iterator<ForwardReadableRange>::type i 
         (boost::const_begin(range));
     char const * const ic (reinterpret_cast<char const *>(storage_iterator(i)));
-    return i + (handle.writeto(addr,
-                               ic,
-                               reinterpret_cast<char const *>(
-                                   storage_iterator(boost::const_end(range))))
-                - ic);
+    std::advance(i, handle.writeto(addr, ic,
+                                   reinterpret_cast<char const *>(
+                                       storage_iterator(boost::const_end(range)))) - ic);
+    return i;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -125,12 +124,9 @@ prefix_ senf::ClientSocketHandle<Policy>::ClientSocketHandle(FileHandle other, b
 
 template <class Policy>
 prefix_
-senf::ClientSocketHandle<Policy>::ClientSocketHandle(std::auto_ptr<SocketProtocol> protocol,
-                                                     int fd)
-    : SocketHandle<Policy>(protocol,false) 
-{
-    this->body().fd(fd);
-}
+senf::ClientSocketHandle<Policy>::ClientSocketHandle(std::auto_ptr<SocketBody> body)
+    : SocketHandle<Policy>(body) 
+{}
 
 #ifndef DOXYGEN
 template <class Policy>
@@ -350,37 +346,6 @@ bind(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::pa
 }
 
 ////////////////////////////////////////
-// Buffering
-
-// senf::ClientSocketHandle<Policy>::rcvbuf
-
-template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::rcvbuf()
-{
-    return Policy::BufferingPolicy::rcvbuf(*this);
-}
-
-template <class Policy>
-prefix_ void senf::ClientSocketHandle<Policy>::rcvbuf(unsigned size)
-{
-    Policy::BufferingPolicy::rcvbuf(*this,size);
-}
-
-// senf::ClientSocketHandle<Policy>::sndbuf
-
-template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::sndbuf()
-{
-    return Policy::BufferingPolicy::sndbuf(*this);
-}
-
-template <class Policy>
-prefix_ void senf::ClientSocketHandle<Policy>::sndbuf(unsigned size)
-{
-    Policy::BufferingPolicy::sndbuf(*this,size);
-}
-
-////////////////////////////////////////
 // Casting
 
 template <class Policy>