X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.ct;h=8e51c2bfd1252f8c8be6e8b96ffd79fb910ea179;hb=7a1872f6702d6206bf1d8364c4e894f98d1c64f0;hp=50c80a81ba6c12d0a2ba613ee2a2c5855956bd61;hpb=b2d64a4084a053f0887c7845bb81074e0cd3a855;p=senf.git diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct index 50c80a8..8e51c2b 100644 --- a/Socket/ClientSocketHandle.ct +++ b/Socket/ClientSocketHandle.ct @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2006 +// Copyright (C) 2006 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) // Kompetenzzentrum fuer Satelitenkommunikation (SatCom) // Stefan Bund @@ -20,17 +20,56 @@ // Free Software Foundation, Inc., // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// Definition of non-inline template functions +/** \file + \brief ClientSocketHandle non-inline template implementation + */ -//#include "ClientSocketHandle.ih" +#include "ClientSocketHandle.ih" // Custom includes +#include +#include "Utils/Buffer.hh" #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////// +// senf::detail::ReadRange + +// senf::detail::ReadRange::read + +template +prefix_ typename boost::range_iterator::type +senf::detail::ReadRange:: +read(Handle & handle, ForwardWritableRange & range) +{ + 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)); +} + +// senf::detail::ReadRange::readfrom + +template +prefix_ typename boost::range_iterator::type +senf::detail::ReadRange:: +readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address & addr) +{ + 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)); +} + +/////////////////////////////////////////////////////////////////////////// +// senf::ClientSocketHandle + +//////////////////////////////////////// +// reading and writing + +// senf::ClientSocketHandle::read + template -prefix_ std::string satcom::lib::ClientSocketHandle::read(unsigned limit) +prefix_ std::string senf::ClientSocketHandle::read(unsigned limit) { std::string rv; this->read(rv,limit); @@ -38,42 +77,46 @@ prefix_ std::string satcom::lib::ClientSocketHandle::read(unsigned limit } template -prefix_ void satcom::lib::ClientSocketHandle::read(std::string & buffer, unsigned limit) +template +prefix_ void senf::ClientSocketHandle::read(Sequence & container, unsigned limit) { - 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()); + unsigned nread (available()); + if (limit>0 && nread>limit) + nread = limit; + container.resize(nread); + container.erase(read( std::make_pair(container.begin(), container.end()) ), + container.end()); } +// senf::ClientSocketHandle::readfrom + template prefix_ std::pair -satcom::lib::ClientSocketHandle::readfrom() +senf::ClientSocketHandle::readfrom(unsigned limit) { std::string rv; typename Policy::AddressingPolicy::Address addr; - this->readfrom(rv,addr); + this->readfrom(rv,addr,limit); return std::make_pair(rv,addr); } template -prefix_ void satcom::lib::ClientSocketHandle:: -readfrom(std::string & buffer, typename Policy::AddressingPolicy::Address & from) +template +prefix_ void senf::ClientSocketHandle::readfrom(Sequence & container, Address & from, + 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()); + 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()); } +// senf::ClientSocketHandle::write + template -prefix_ unsigned satcom::lib::ClientSocketHandle::write(std::string const & data) +prefix_ unsigned senf::ClientSocketHandle::write(std::string const & data) { unsigned written = this->write(data.data(),data.size()); if (written == 0) @@ -85,7 +128,7 @@ prefix_ unsigned satcom::lib::ClientSocketHandle::write(std::string cons // 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); + unsigned n = this->write(data.data()+written,data.size()-written); if (n == 0) throw SystemException(EPIPE); written += n; @@ -93,13 +136,24 @@ prefix_ unsigned satcom::lib::ClientSocketHandle::write(std::string cons return written; } +//////////////////////////////////////// +// private members + +// senf::ClientSocketHandle::available + template -prefix_ unsigned satcom::lib::ClientSocketHandle::available() +prefix_ unsigned senf::ClientSocketHandle::available() { unsigned nread = this->protocol().available(); if (nread == 0 && this->blocking()) { - 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; } @@ -110,5 +164,8 @@ prefix_ unsigned satcom::lib::ClientSocketHandle::available() // Local Variables: // mode: c++ -// c-file-style: "satcom" +// fill-column: 100 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" // End: