X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.ct;h=c6fa8fd4de22ae470902d572ce5e65b264f16bb6;hb=b8ca4a544cce3e6023bb56b712a03d6362f2bb79;hp=9379c7c6a2f14365068cdd4d897e83e4399a8dd4;hpb=3601c83f32cad85638739f891218f1e5d9fa0896;p=senf.git diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct index 9379c7c..c6fa8fd 100644 --- a/Socket/ClientSocketHandle.ct +++ b/Socket/ClientSocketHandle.ct @@ -1,9 +1,9 @@ // $Id$ // -// Copyright (C) 2006 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) -// Stefan Bund +// Copyright (C) 2006 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Stefan Bund // // 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,93 +21,141 @@ // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** \file - \brief senf::ClientSocketHandle non-inline template implementation + \brief ClientSocketHandle non-inline template implementation */ -//#include "ClientSocketHandle.ih" +#include "ClientSocketHandle.ih" // Custom includes +#include +#include +#include "../Utils/Buffer.hh" #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// -template -prefix_ std::string senf::ClientSocketHandle::read(unsigned limit) +/////////////////////////////////////////////////////////////////////////// +// senf::detail::ReadRange + +template +prefix_ typename boost::range_iterator::type +senf::detail::ReadRange:: +read(Handle & handle, ForwardWritableRange & range) { - std::string rv; - this->read(rv,limit); - return rv; + typename boost::range_size::type nread (boost::size(range)); + SENF_SCOPED_BUFFER(char, buffer, nread); + return std::copy(buffer, handle.read(buffer,buffer+nread), boost::begin(range)); } -template -prefix_ void senf::ClientSocketHandle::read(std::string & buffer, unsigned limit) +template +prefix_ typename boost::range_iterator::type +senf::detail::ReadRange:: +readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address & addr) { - unsigned nread = available(); - if (limit>0 && nread>limit) - nread = limit; - /** \fixme This is not necessary correct and more or less a hack ... */ - buffer.assign(nread,0); - unsigned rv = this->read(const_cast(buffer.data()),nread); - if (rv < nread) - buffer.erase(buffer.begin()+rv,buffer.end()); + typename boost::range_size::type nread (boost::size(range)); + SENF_SCOPED_BUFFER(char, buffer, nread); + return std::copy(buffer, handle.readfrom(buffer,buffer+nread,addr), boost::begin(range)); } -template -prefix_ std::pair -senf::ClientSocketHandle::readfrom() +/////////////////////////////////////////////////////////////////////////// +// senf::detail::WriteRange + +template +prefix_ typename boost::range_const_iterator::type +senf::detail::WriteRange:: +write(Handle & handle, ForwardReadableRange & range) +{ + typename boost::range_size::type nwrite (boost::size(range)); + typename boost::range_const_iterator::type i (boost::begin(range)); + SENF_SCOPED_BUFFER(char, buffer, nwrite); + std::copy(i, boost::end(range), buffer); + std::advance(i, handle.write(std::make_pair(buffer, buffer+nwrite)) - buffer); + return i; +} + +template +prefix_ typename boost::range_const_iterator::type +senf::detail::WriteRange:: +writeto(Handle & handle, ForwardReadableRange & range, typename Handle::Address const & addr) +{ + typename boost::range_size::type nwrite (boost::size(range)); + typename boost::range_const_iterator::type i (boost::begin(range)); + SENF_SCOPED_BUFFER(char, buffer, nwrite); + std::copy(i, boost::end(range), buffer); + std::advance(i, handle.writeto(std::make_pair(buffer, buffer+nwrite), addr) - buffer); + return i; +} + +/////////////////////////////////////////////////////////////////////////// +// senf::ClientSocketHandle + +//////////////////////////////////////// +// reading and writing + +// senf::ClientSocketHandle::read + +template +prefix_ std::string senf::ClientSocketHandle::read(unsigned limit) { std::string rv; - typename Policy::AddressingPolicy::Address addr; - this->readfrom(rv,addr); - return std::make_pair(rv,addr); + this->read(rv, limit); + return rv; +} + +template +template +prefix_ void senf::ClientSocketHandle::read(Sequence & container, unsigned limit) +{ + if (limit == 0) + limit = available(); + container.resize(limit); + container.erase(read( std::make_pair(container.begin(), container.end()) ), + container.end()); } -template -prefix_ void senf::ClientSocketHandle:: -readfrom(std::string & buffer, typename Policy::AddressingPolicy::Address & from) +// senf::ClientSocketHandle::readfrom + +template +prefix_ std::pair +senf::ClientSocketHandle::readfrom(unsigned limit) { - unsigned nread = available(); - /** \fixme This is not necessary correct and more or less a hack ... */ - buffer.assign(nread,0); - unsigned rv = this->readfrom(const_cast(buffer.data()), nread, from); - if (rv < nread) - buffer.erase(buffer.begin()+rv,buffer.end()); + std::string rv; + boost::value_initialized addr; + this->readfrom(rv, addr.data(), limit); + return std::make_pair(rv, addr.data()); } -template -prefix_ unsigned senf::ClientSocketHandle::write(std::string const & data) +template +template +prefix_ void senf::ClientSocketHandle::readfrom(Sequence & container, Address & from, + unsigned limit) { - unsigned written = this->write(data.data(),data.size()); - if (written == 0) - throw SystemException(EPIPE); - // This implementation ensures, we only call blocking() when - // necessary (since it incurs a system call overhead ...) - if (written < data.size() && this->blocking()) - // We need to enforce in the WritePolicy implementation, that - // DatagramFramingPolicy sockets will ALWAYS either write the - // complete datagram or nothing at all - while (written < data.size()) { - unsigned n = this->write(data.data()+written,data.size()-written); - if (n == 0) - throw SystemException(EPIPE); - written += n; - } - return written; + unsigned nread (available()); + if (limit>0 && nread>limit) + nread = limit; + container.resize(nread); + container.erase(readfrom( std::make_pair(container.begin(), container.end()), from ), + container.end()); } -template -prefix_ unsigned senf::ClientSocketHandle::available() +//////////////////////////////////////// +// private members + +// senf::ClientSocketHandle::available + +template +prefix_ unsigned senf::ClientSocketHandle::available() { unsigned nread = this->protocol().available(); if (nread == 0 && this->blocking()) { - // We have to block explicitly here so we can return the - // number of bytes available explicitly. If no more date can - // be expected to arive (i.e. the other end has closed the - // connection), the socket will always be in the readable - // state. This is the only case when available() will return - // 0. - this->waitReadable(); - nread = this->protocol().available(); + // We have to block explicitly here so we can return the + // number of bytes available explicitly. If no more date can + // be expected to arive (i.e. the other end has closed the + // connection), the socket will always be in the readable + // state. This is the only case when available() will return + // 0. + this->waitReadable(); + nread = this->protocol().available(); } return nread; } @@ -118,5 +166,10 @@ prefix_ unsigned senf::ClientSocketHandle::available() // 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: