X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.cti;h=f584a18e0b08bb5abd1093173fa3d8aea98debd4;hb=81ffa1c459b96dd44472bcef37e1e373934ee138;hp=669aa38ffa203c05931464ccdd5df47b138dcd55;hpb=ac88c68bb3aebad5f7d91ce44f1c845d973f9613;p=senf.git diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti index 669aa38..f584a18 100644 --- a/Socket/ClientSocketHandle.cti +++ b/Socket/ClientSocketHandle.cti @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2006 +// Copyright (C) 2006 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) // Kompetenzzentrum fuer Satelitenkommunikation (SatCom) // Stefan Bund @@ -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 @@ -32,28 +32,107 @@ #define prefix_ inline ///////////////////////////////cti.p/////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// +// senf::detail::ReadRange + +template +prefix_ typename boost::range_iterator::type +senf::detail::ReadRange::read(Handle & handle, + ForwardWritableRange & range) +{ + typename boost::range_iterator::type const i (boost::begin(range)); + char * const ic (reinterpret_cast(storage_iterator(i))); + return i + (handle.read( ic, + reinterpret_cast(storage_iterator(boost::end(range))) ) + - ic); +} + +template +prefix_ typename boost::range_iterator::type +senf::detail::ReadRange:: +readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address & addr) +{ + typename boost::range_iterator::type const i (boost::begin(range)); + char * const ic (reinterpret_cast(storage_iterator(i))); + return i + (handle.readfrom( ic, + reinterpret_cast(storage_iterator(boost::end(range))), + addr ) + - ic); +} + +/////////////////////////////////////////////////////////////////////////// +// senf::detail::WriteRange + +template +prefix_ typename boost::range_const_iterator::type +senf::detail::WriteRange:: +write(Handle & handle, ForwardReadableRange & range) +{ + typename boost::range_const_iterator::type const i + (boost::const_begin(range)); + char const * const ic (reinterpret_cast(storage_iterator(i))); + return i + (handle.write(ic, + reinterpret_cast( + storage_iterator(boost::const_end(range)))) + - ic); +} + +template +prefix_ typename boost::range_const_iterator::type +senf::detail::WriteRange:: +writeto(Handle & handle, ForwardReadableRange & range, typename Handle::Address const & addr) +{ + typename boost::range_const_iterator::type const i + (boost::const_begin(range)); + char const * const ic (reinterpret_cast(storage_iterator(i))); + return i + (handle.writeto(addr, + ic, + reinterpret_cast( + storage_iterator(boost::const_end(range)))) + - ic); +} + +/////////////////////////////////////////////////////////////////////////// +// senf::ClientSocketHandle + +//////////////////////////////////////// +// structors + +template +prefix_ senf::ClientSocketHandle::ClientSocketHandle() +{} + +#ifndef DOXYGEN template template prefix_ senf::ClientSocketHandle:: ClientSocketHandle(ClientSocketHandle other, typename SocketHandle::template IsCompatible::type *) - : SocketHandle(other,true) + : SocketHandle(other,true) {} +#else +template +template +prefix_ senf::ClientSocketHandle:: +ClientSocketHandle(ClientSocketHandle other) +{} +#endif template -prefix_ senf::ClientSocketHandle::ClientSocketHandle(FileHandle other, - bool isChecked) - : SocketHandle(other, isChecked) +prefix_ senf::ClientSocketHandle::ClientSocketHandle(FileHandle other, bool isChecked) + : SocketHandle(other, isChecked) {} template -prefix_ senf::ClientSocketHandle:: -ClientSocketHandle(std::auto_ptr protocol, int fd) - : SocketHandle(protocol,false) +prefix_ +senf::ClientSocketHandle::ClientSocketHandle(std::auto_ptr protocol, + int fd) + : SocketHandle(protocol,false) { this->body().fd(fd); } +#ifndef DOXYGEN template template prefix_ typename senf::SocketHandle::template IsCompatible::type const & @@ -62,52 +141,163 @@ senf::ClientSocketHandle::operator=(ClientSocketHandle othe assign(other); return *this; } +#else +template +template +prefix_ OtherPolicy const & +senf::ClientSocketHandle::operator=(ClientSocketHandle other) +{} +#endif -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////// // reading and writing +// senf::ClientSocketHandle::read + +#ifndef DOXYGEN template -prefix_ unsigned senf::ClientSocketHandle::read(char * buffer, - unsigned size) +template +prefix_ typename boost::range_iterator::type +senf::ClientSocketHandle:: +read(ForwardWritableRange const & range, + typename boost::disable_if< boost::is_convertible >::type *) { - return Policy::ReadPolicy::read(*this, buffer, size); + return detail::ReadRange< + ClientSocketHandle, + ForwardWritableRange const, + contiguous_storage_iterator< + typename boost::range_iterator::type + >::value && sizeof(typename boost::range_value::type)==sizeof(char) + >::read(*this, range); } +#else +template +template +prefix_ typename boost::range_iterator::type +senf::ClientSocketHandle:: +read(ForwardWritableRange const & range) +{} +#endif +#ifndef DOXYGEN template -prefix_ unsigned senf::ClientSocketHandle:: -readfrom(char * buffer, unsigned size, typename Policy::AddressingPolicy::Address & from) +template +prefix_ typename boost::range_iterator::type +senf::ClientSocketHandle:: +read(ForwardWritableRange & range, + typename boost::disable_if< boost::is_convertible >::type *) { - return Policy::ReadPolicy::readfrom(*this, buffer, size, from); + return detail::ReadRange< + ClientSocketHandle, + ForwardWritableRange, + contiguous_storage_iterator< + typename boost::range_iterator::type + >::value && sizeof(typename boost::range_value::type)==sizeof(char) + >::read(*this, range); } +#else +template +template +prefix_ typename boost::range_iterator::type +senf::ClientSocketHandle:: +read(ForwardWritableRange & range) +{} +#endif template -prefix_ unsigned senf::ClientSocketHandle::write(char const * buffer, - unsigned size) +prefix_ char * senf::ClientSocketHandle::read(char * start, char * end) { - return Policy::WritePolicy::write(*this, buffer, size); + return start + Policy::ReadPolicy::read(*this, start, end-start); } +// senf::ClientSocketHandle::readfrom + template -prefix_ unsigned senf::ClientSocketHandle:: -writeto(typename boost::call_traits::param_type addr, - std::string const & data) +template +prefix_ typename boost::range_iterator::type +senf::ClientSocketHandle::readfrom(ForwardWritableRange const & range, Address & from) { - return this->writeto(addr, data.data(), data.size()); + return detail::ReadRange< + ClientSocketHandle, + ForwardWritableRange const, + contiguous_storage_iterator< + typename boost::range_iterator::type + >::value && sizeof(typename boost::range_value::type)==sizeof(char) + >::readfrom(*this, range, from); } template -prefix_ unsigned senf::ClientSocketHandle:: -writeto(typename boost::call_traits::param_type addr, - char const * buffer, unsigned size) +template +prefix_ typename boost::range_iterator::type +senf::ClientSocketHandle::readfrom(ForwardWritableRange & range, Address & from) { - return Policy::WritePolicy::writeto(*this, addr, buffer, size); + return detail::ReadRange< + ClientSocketHandle, + ForwardWritableRange, + contiguous_storage_iterator< + typename boost::range_iterator::type + >::value && sizeof(typename boost::range_value::type)==sizeof(char) + >::readfrom(*this, range, from); } -/////////////////////////////////////////////////////////////////////////// +template +prefix_ char * senf::ClientSocketHandle::readfrom(char * start, char * end, + Address & from) +{ + return start + Policy::ReadPolicy::readfrom(*this, start, end-start, from); +} + +// senf::ClientSocketHandle::write + +template +template +prefix_ typename boost::range_const_iterator::type +senf::ClientSocketHandle::write(ForwardReadableRange const & range) +{ + return detail::WriteRange< + ClientSocketHandle, + ForwardReadableRange const, + contiguous_storage_iterator< + typename boost::range_iterator::type + >::value && sizeof(typename boost::range_value::type)==sizeof(char) + >::write(*this, range); +} + +template +prefix_ char const * senf::ClientSocketHandle::write(char const * start, char const * end) +{ + return start + Policy::WritePolicy::write(*this, start, end-start); +} + +// senf::ClientSocketHandle::writeto + +template +template +prefix_ typename boost::range_const_iterator::type +senf::ClientSocketHandle::writeto(AddressParam addr, ForwardReadableRange const & range) +{ + return detail::WriteRange< + ClientSocketHandle, + ForwardReadableRange const, + contiguous_storage_iterator< + typename boost::range_iterator::type + >::value && sizeof(typename boost::range_value::type)==sizeof(char) + >::writeto(*this, range, addr); +} + +template +prefix_ char const * senf::ClientSocketHandle::writeto(AddressParam addr, + char const * start, + char const * end) +{ + return start + Policy::WritePolicy::writeto(*this, addr, start, end-start); +} + +//////////////////////////////////////// // addressing +// senf::ClientSocketHandle::peer + template prefix_ typename Policy::AddressingPolicy::Address senf::ClientSocketHandle::peer() @@ -124,6 +314,8 @@ peer(typename Policy::AddressingPolicy::Address & addr) Policy::AddressingPolicy::peer(*this,addr); } +// senf::ClientSocketHandle::local + template prefix_ typename Policy::AddressingPolicy::Address senf::ClientSocketHandle::local() @@ -140,12 +332,16 @@ local(typename Policy::AddressingPolicy::Address & addr) Policy::AddressingPolicy::local(*this,addr); } +// senf::ClientSocketHandle::connect + template prefix_ void senf::ClientSocketHandle::connect(AddressParam addr) { Policy::AddressingPolicy::connect(*this,addr); } +// senf::ClientSocketHandle::bind + template prefix_ void senf::ClientSocketHandle:: bind(typename boost::call_traits::param_type addr) @@ -153,9 +349,11 @@ bind(typename boost::call_traits::pa Policy::AddressingPolicy::bind(*this,addr); } -/////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////// // Buffering +// senf::ClientSocketHandle::rcvbuf + template prefix_ unsigned senf::ClientSocketHandle::rcvbuf() { @@ -168,6 +366,8 @@ prefix_ void senf::ClientSocketHandle::rcvbuf(unsigned size) Policy::BufferingPolicy::rcvbuf(*this,size); } +// senf::ClientSocketHandle::sndbuf + template prefix_ unsigned senf::ClientSocketHandle::sndbuf() { @@ -180,7 +380,8 @@ prefix_ void senf::ClientSocketHandle::sndbuf(unsigned size) Policy::BufferingPolicy::sndbuf(*this,size); } -/////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////// +// Casting template prefix_ senf::ClientSocketHandle @@ -199,6 +400,9 @@ senf::ClientSocketHandle::cast_dynamic(FileHandle handle) return cast_static(handle); } +//////////////////////////////////////// +// State information + template prefix_ void senf::ClientSocketHandle::state(SocketStateMap & map, unsigned lod) { @@ -220,5 +424,10 @@ prefix_ std::string senf::ClientSocketHandle::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: