X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fhttp%2FTransport.cpp;h=0b78c0849c63d7f491520ee47bc051938d0da7a4;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=c04dabb8b52ae5a8eddc720e0ff8ab88fe4a34ef;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/http/Transport.cpp b/source/http/Transport.cpp index c04dabb..0b78c08 100644 --- a/source/http/Transport.cpp +++ b/source/http/Transport.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of the copyright holder nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -75,7 +47,7 @@ http::Transport::Transport() : // importantes del mensaje HTTP recibido. //---------------------------------------------------------------------------------------------- void http::Transport::clear() -throw() { +{ comm::Transport::clear(); if(a_inputMessage != NULL) { @@ -95,7 +67,7 @@ throw() { } http::Message* http::Transport::getInputMessage() -throw(RuntimeException) { +noexcept(false) { if(a_inputMessage == NULL) throw RuntimeException("getInputMessage | HTTP message was not extracted", ANNA_FILE_LOCATION); @@ -103,7 +75,7 @@ throw(RuntimeException) { } void http::Transport::setParserState(const parser::Abstract* parser) -throw(RuntimeException) { +noexcept(false) { if(a_parser == parser) return; @@ -118,7 +90,7 @@ throw(RuntimeException) { } http::Message* http::Transport::allocateInputMessage(const http::Message::Type::_v type) -throw(RuntimeException) { +noexcept(false) { if(a_inputMessage != NULL) throw RuntimeException("http::Transport::allocateInputMessage | Former HTTP message was not released", ANNA_FILE_LOCATION); @@ -126,19 +98,19 @@ throw(RuntimeException) { } const http::Tokenizer& http::Transport::split(const http::Token& token) -throw(RuntimeException) { +noexcept(false) { a_lineScope.apply(token); return a_lineScope; } const http::Tokenizer& http::Transport::split(const http::Token& token, const char* separator) -throw(RuntimeException) { +noexcept(false) { a_lineScope.apply(token, separator); return a_lineScope; } const http::Tokenizer& http::Transport::split(const http::Token& token, const char separator) -throw(RuntimeException) { +noexcept(false) { a_lineScope.apply(token, separator); return a_lineScope; } @@ -147,7 +119,7 @@ throw(RuntimeException) { * El segundo bloque se crea con el tamaƱo calculado al analizar el mensaje */ const http::Message* http::Transport::externalDecode(const char* buffer, const int size) -throw(RuntimeException) { +noexcept(false) { DataBlock dataBlock(buffer, size, false); clear(); int httpSize; @@ -184,7 +156,7 @@ throw(RuntimeException) { // (2) Si estamos analizando un Transfer-Encoding: chunked. //---------------------------------------------------------------------------------------------- int http::Transport::calculeSize(const DataBlock& dataBlock) -throw(RuntimeException) { +noexcept(false) { Tokenizer::iterator ii; Tokenizer::iterator maxii; int result = -1; @@ -242,7 +214,7 @@ throw(RuntimeException) { // para comenzar con el analisis de un un nuevo mensaje. //---------------------------------------------------------------------------------------------- const comm::Message* http::Transport::decode(const DataBlock& dataBlock) -throw(RuntimeException) { +noexcept(false) { const bool isEncoded = (a_encodedBlock == NULL) ? false : a_encodedBlock->isValid(); if(isEncoded == true) { @@ -291,12 +263,12 @@ throw(RuntimeException) { // Toda la complejidad de la codificacion la soporta el http::Message. //----------------------------------------------------------------------------------------------------- const DataBlock& http::Transport::code(comm::Message& message) -throw(RuntimeException) { +noexcept(false) { return message.code(); } http::EncodedBlock* http::Transport::getEncodedBlock() -throw() { +{ if(a_encodedBlock == NULL) a_encodedBlock = new EncodedBlock;