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

diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti
index 669aa38..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>
+// Copyright (C) 2006
+// 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
@@ -21,10 +21,10 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief senf::ClientSocketHandle inline template implementation
+    \brief ClientSocketHandle inline template implementation
  */
 
-//#include "ClientSocketHandle.ih"
+#include "ClientSocketHandle.ih"
 
 // Custom includes
 #include <typeinfo>
@@ -32,28 +32,103 @@
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::ReadRange<Policy,ForwardWritableRange,true>
+
+template <class Handle, class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange>::type
+senf::detail::ReadRange<Handle,ForwardWritableRange,true>::read(Handle & handle,
+                                                                ForwardWritableRange & range)
+{
+    typename boost::range_iterator<ForwardWritableRange>::type const i (boost::begin(range));
+    char * const ic (reinterpret_cast<char*>(storage_iterator(i)));
+    return i + (handle.read( ic, 
+                             reinterpret_cast<char*>(storage_iterator(boost::end(range))) )
+                - ic);
+}
+
+template <class Handle, class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange>::type
+senf::detail::ReadRange<Handle,ForwardWritableRange,true>::
+readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address & addr)
+{
+    typename boost::range_iterator<ForwardWritableRange>::type const i (boost::begin(range));
+    char * const ic (reinterpret_cast<char*>(storage_iterator(i)));
+    return i + (handle.readfrom( ic, 
+                                 reinterpret_cast<char*>(storage_iterator(boost::end(range))),
+                                 addr )
+                - ic);
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::WriteRange<Handle, ForwardReadableRange, true>
+
+template <class Handle, class ForwardReadableRange>
+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 i 
+        (boost::const_begin(range));
+    char const * const ic (reinterpret_cast<char const *>(storage_iterator(i)));
+    std::advance(i, handle.write(ic,
+                                 reinterpret_cast<char const *>(
+                                     storage_iterator(boost::const_end(range)))) - ic);
+    return i;
+}
+
+template <class Handle, class ForwardReadableRange>
+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 i 
+        (boost::const_begin(range));
+    char const * const ic (reinterpret_cast<char const *>(storage_iterator(i)));
+    std::advance(i, handle.writeto(addr, ic,
+                                   reinterpret_cast<char const *>(
+                                       storage_iterator(boost::const_end(range)))) - ic);
+    return i;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::ClientSocketHandle<Policy>
+
+////////////////////////////////////////
+// structors
+
+template <class Policy>
+prefix_ senf::ClientSocketHandle<Policy>::ClientSocketHandle()
+{}
+
+#ifndef DOXYGEN
 template <class Policy>
 template <class OtherPolicy>
 prefix_ senf::ClientSocketHandle<Policy>::
 ClientSocketHandle(ClientSocketHandle<OtherPolicy> other,
                    typename SocketHandle<Policy>::template IsCompatible<OtherPolicy>::type *)
-    : SocketHandle<Policy>(other,true)
+    : SocketHandle<Policy>(other,true) 
 {}
+#else
+template <class Policy>
+template <class OtherPolicy>
+prefix_ senf::ClientSocketHandle<Policy>::
+ClientSocketHandle(ClientSocketHandle<OtherPolicy> other)
+{}
+#endif
 
 template <class Policy>
-prefix_ senf::ClientSocketHandle<Policy>::ClientSocketHandle(FileHandle other,
-                                                                    bool isChecked)
-    : SocketHandle<Policy>(other, isChecked)
+prefix_ senf::ClientSocketHandle<Policy>::ClientSocketHandle(FileHandle other, bool isChecked)
+    : SocketHandle<Policy>(other, isChecked) 
 {}
 
 template <class Policy>
-prefix_  senf::ClientSocketHandle<Policy>::
-ClientSocketHandle(std::auto_ptr<SocketProtocol> protocol, int fd)
-    : SocketHandle<Policy>(protocol,false)
-{
-    this->body().fd(fd);
-}
+prefix_
+senf::ClientSocketHandle<Policy>::ClientSocketHandle(std::auto_ptr<SocketBody> body)
+    : SocketHandle<Policy>(body) 
+{}
 
+#ifndef DOXYGEN
 template <class Policy>
 template <class OtherPolicy>
 prefix_ typename senf::SocketHandle<Policy>::template IsCompatible<OtherPolicy>::type const &
@@ -62,52 +137,163 @@ senf::ClientSocketHandle<Policy>::operator=(ClientSocketHandle<OtherPolicy> othe
     assign(other);
     return *this;
 }
+#else 
+template <class Policy>
+template <class OtherPolicy>
+prefix_ OtherPolicy const &
+senf::ClientSocketHandle<Policy>::operator=(ClientSocketHandle<OtherPolicy> other)
+{}
+#endif
 
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////
 // reading and writing
 
+// senf::ClientSocketHandle<Policy>::read
+
+#ifndef DOXYGEN
 template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::read(char * buffer,
-                                                                     unsigned size)
+template <class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange>::type
+senf::ClientSocketHandle<Policy>::
+read(ForwardWritableRange const & range,
+     typename boost::disable_if< boost::is_convertible<ForwardWritableRange,unsigned> >::type *)
 {
-    return Policy::ReadPolicy::read(*this, buffer, size);
+    return detail::ReadRange< 
+        ClientSocketHandle<Policy>, 
+        ForwardWritableRange const, 
+        contiguous_storage_iterator<
+            typename boost::range_iterator<ForwardWritableRange>::type
+        >::value && sizeof(typename boost::range_value<ForwardWritableRange>::type)==sizeof(char)
+        >::read(*this, range);
 }
+#else
+template <class Policy>
+template <class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange>::type
+senf::ClientSocketHandle<Policy>::
+read(ForwardWritableRange const & range)
+{}
+#endif
 
+#ifndef DOXYGEN
 template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::
-readfrom(char * buffer, unsigned size, typename Policy::AddressingPolicy::Address & from)
+template <class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange>::type
+senf::ClientSocketHandle<Policy>::
+read(ForwardWritableRange & range,
+     typename boost::disable_if< boost::is_convertible<ForwardWritableRange,unsigned> >::type *)
 {
-    return Policy::ReadPolicy::readfrom(*this, buffer, size, from);
+    return detail::ReadRange< 
+        ClientSocketHandle<Policy>, 
+        ForwardWritableRange, 
+        contiguous_storage_iterator<
+            typename boost::range_iterator<ForwardWritableRange>::type
+        >::value && sizeof(typename boost::range_value<ForwardWritableRange>::type)==sizeof(char)
+        >::read(*this, range);
 }
+#else
+template <class Policy>
+template <class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange>::type
+senf::ClientSocketHandle<Policy>::
+read(ForwardWritableRange & range)
+{}
+#endif
 
 template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::write(char const * buffer,
-                                                                unsigned size)
+prefix_ char * senf::ClientSocketHandle<Policy>::read(char * start, char * end)
 {
-    return Policy::WritePolicy::write(*this, buffer, size);
+    return start + Policy::ReadPolicy::read(*this, start, end-start);
 }
 
+// senf::ClientSocketHandle<Policy>::readfrom
+
 template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::
-writeto(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr,
-        std::string const & data)
+template <class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange const>::type
+senf::ClientSocketHandle<Policy>::readfrom(ForwardWritableRange const & range, Address & from)
 {
-    return this->writeto(addr, data.data(), data.size());
+    return detail::ReadRange< 
+        ClientSocketHandle<Policy>, 
+        ForwardWritableRange const, 
+        contiguous_storage_iterator<
+            typename boost::range_iterator<ForwardWritableRange>::type
+        >::value && sizeof(typename boost::range_value<ForwardWritableRange>::type)==sizeof(char)
+        >::readfrom(*this, range, from);
 }
 
 template <class Policy>
-prefix_ unsigned senf::ClientSocketHandle<Policy>::
-writeto(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr,
-        char const * buffer, unsigned size)
+template <class ForwardWritableRange>
+prefix_ typename boost::range_iterator<ForwardWritableRange>::type
+senf::ClientSocketHandle<Policy>::readfrom(ForwardWritableRange & range, Address & from)
 {
-    return Policy::WritePolicy::writeto(*this, addr, buffer, size);
+    return detail::ReadRange< 
+        ClientSocketHandle<Policy>, 
+        ForwardWritableRange, 
+        contiguous_storage_iterator<
+            typename boost::range_iterator<ForwardWritableRange>::type
+        >::value && sizeof(typename boost::range_value<ForwardWritableRange>::type)==sizeof(char)
+        >::readfrom(*this, range, from);
 }
 
-///////////////////////////////////////////////////////////////////////////
+template <class Policy>
+prefix_ char * senf::ClientSocketHandle<Policy>::readfrom(char * start, char * end,
+                                                          Address & from)
+{
+    return start + Policy::ReadPolicy::readfrom(*this, start, end-start, from);
+}
+
+// senf::ClientSocketHandle<Policy>::write
+
+template <class Policy>
+template <class ForwardReadableRange>
+prefix_ typename boost::range_const_iterator<ForwardReadableRange const>::type
+senf::ClientSocketHandle<Policy>::write(ForwardReadableRange const & range)
+{
+    return detail::WriteRange<
+        ClientSocketHandle<Policy>,
+        ForwardReadableRange const,
+        contiguous_storage_iterator<
+            typename boost::range_iterator<ForwardReadableRange>::type
+        >::value && sizeof(typename boost::range_value<ForwardReadableRange>::type)==sizeof(char)
+        >::write(*this, range);
+}
+
+template <class Policy>
+prefix_ char const * senf::ClientSocketHandle<Policy>::write(char const * start, char const * end)
+{
+    return start + Policy::WritePolicy::write(*this, start, end-start);
+}
+
+// senf::ClientSocketHandle<Policy>::writeto
+
+template <class Policy>
+template <class ForwardReadableRange>
+prefix_ typename boost::range_const_iterator<ForwardReadableRange const>::type
+senf::ClientSocketHandle<Policy>::writeto(AddressParam addr, ForwardReadableRange const & range)
+{
+    return detail::WriteRange<
+        ClientSocketHandle<Policy>,
+        ForwardReadableRange const,
+        contiguous_storage_iterator<
+            typename boost::range_iterator<ForwardReadableRange>::type
+        >::value && sizeof(typename boost::range_value<ForwardReadableRange>::type)==sizeof(char)
+        >::writeto(*this, range, addr);
+}
+
+template <class Policy>
+prefix_ char const * senf::ClientSocketHandle<Policy>::writeto(AddressParam addr,
+                                                               char const * start,
+                                                               char const * end)
+{
+    return start + Policy::WritePolicy::writeto(*this, addr, start, end-start);
+}
+
+////////////////////////////////////////
 // addressing
 
+// senf::ClientSocketHandle<Policy>::peer
+
 template <class Policy>
 prefix_ typename Policy::AddressingPolicy::Address
 senf::ClientSocketHandle<Policy>::peer()
@@ -124,6 +310,8 @@ peer(typename Policy::AddressingPolicy::Address & addr)
     Policy::AddressingPolicy::peer(*this,addr);
 }
 
+// senf::ClientSocketHandle<Policy>::local
+
 template <class Policy>
 prefix_ typename Policy::AddressingPolicy::Address
 senf::ClientSocketHandle<Policy>::local()
@@ -140,12 +328,16 @@ local(typename Policy::AddressingPolicy::Address & addr)
     Policy::AddressingPolicy::local(*this,addr);
 }
 
+// senf::ClientSocketHandle<Policy>::connect
+
 template <class Policy>
 prefix_ void senf::ClientSocketHandle<Policy>::connect(AddressParam addr)
 {
     Policy::AddressingPolicy::connect(*this,addr);
 }
 
+// senf::ClientSocketHandle<Policy>::bind
+
 template <class Policy>
 prefix_ void senf::ClientSocketHandle<Policy>::
 bind(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::param_type addr)
@@ -153,34 +345,8 @@ bind(typename boost::call_traits<typename Policy::AddressingPolicy::Address>::pa
     Policy::AddressingPolicy::bind(*this,addr);
 }
 
-///////////////////////////////////////////////////////////////////////////
-// Buffering
-
-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);
-}
-
-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>
 prefix_ senf::ClientSocketHandle<Policy>
@@ -199,6 +365,9 @@ senf::ClientSocketHandle<Policy>::cast_dynamic(FileHandle handle)
     return cast_static(handle);
 }
 
+////////////////////////////////////////
+// State information
+
 template <class Policy>
 prefix_ void senf::ClientSocketHandle<Policy>::state(SocketStateMap & map, unsigned lod)
 {
@@ -220,5 +389,10 @@ prefix_ std::string senf::ClientSocketHandle<Policy>::dumpState(unsigned lod)
 
 // Local Variables:
 // mode: c++
+// fill-column: 100
 // c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: