X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FClientSocketHandle.ct;h=c6fa8fd4de22ae470902d572ce5e65b264f16bb6;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=8e51c2bfd1252f8c8be6e8b96ffd79fb910ea179;hpb=7a1872f6702d6206bf1d8364c4e894f98d1c64f0;p=senf.git diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct index 8e51c2b..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 +// 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 @@ -28,7 +28,8 @@ // Custom includes #include -#include "Utils/Buffer.hh" +#include +#include "../Utils/Buffer.hh" #define prefix_ ///////////////////////////////ct.p//////////////////////////////////////// @@ -36,8 +37,6 @@ /////////////////////////////////////////////////////////////////////////// // senf::detail::ReadRange -// senf::detail::ReadRange::read - template prefix_ typename boost::range_iterator::type senf::detail::ReadRange:: @@ -48,8 +47,6 @@ read(Handle & handle, ForwardWritableRange & range) 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:: @@ -61,6 +58,35 @@ readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address } /////////////////////////////////////////////////////////////////////////// +// 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 //////////////////////////////////////// @@ -68,41 +94,40 @@ readfrom(Handle & handle, ForwardWritableRange & range, typename Handle::Address // senf::ClientSocketHandle::read -template -prefix_ std::string senf::ClientSocketHandle::read(unsigned limit) +template +prefix_ std::string senf::ClientSocketHandle::read(unsigned limit) { std::string rv; - this->read(rv,limit); + this->read(rv, limit); return rv; } -template +template template -prefix_ void senf::ClientSocketHandle::read(Sequence & container, unsigned limit) +prefix_ void senf::ClientSocketHandle::read(Sequence & container, unsigned limit) { - unsigned nread (available()); - if (limit>0 && nread>limit) - nread = limit; - container.resize(nread); + if (limit == 0) + limit = available(); + container.resize(limit); container.erase(read( std::make_pair(container.begin(), container.end()) ), container.end()); } -// senf::ClientSocketHandle::readfrom +// senf::ClientSocketHandle::readfrom -template -prefix_ std::pair -senf::ClientSocketHandle::readfrom(unsigned limit) +template +prefix_ std::pair +senf::ClientSocketHandle::readfrom(unsigned limit) { std::string rv; - typename Policy::AddressingPolicy::Address addr; - this->readfrom(rv,addr,limit); - return std::make_pair(rv,addr); + boost::value_initialized addr; + this->readfrom(rv, addr.data(), limit); + return std::make_pair(rv, addr.data()); } -template +template template -prefix_ void senf::ClientSocketHandle::readfrom(Sequence & container, Address & from, +prefix_ void senf::ClientSocketHandle::readfrom(Sequence & container, Address & from, unsigned limit) { unsigned nread (available()); @@ -113,36 +138,13 @@ prefix_ void senf::ClientSocketHandle::readfrom(Sequence & container, Ad container.end()); } -// senf::ClientSocketHandle::write - -template -prefix_ unsigned senf::ClientSocketHandle::write(std::string const & data) -{ - 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; -} - //////////////////////////////////////// // private members -// senf::ClientSocketHandle::available +// senf::ClientSocketHandle::available -template -prefix_ unsigned senf::ClientSocketHandle::available() +template +prefix_ unsigned senf::ClientSocketHandle::available() { unsigned nread = this->protocol().available(); if (nread == 0 && this->blocking()) { @@ -168,4 +170,6 @@ prefix_ unsigned senf::ClientSocketHandle::available() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: