X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FEngine.cpp;h=40289914303d9784bcb4aec6fa494125611351a6;hb=84c30c372cf2926a138a6d51a52d56f3b2a63804;hp=e59e423e75c79f21cebaf89fa41a9275e7e1837d;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/diameter.comm/Engine.cpp b/source/diameter.comm/Engine.cpp index e59e423..4028991 100644 --- a/source/diameter.comm/Engine.cpp +++ b/source/diameter.comm/Engine.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// 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 Google Inc. 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 @@ -65,8 +37,9 @@ using namespace std; using namespace anna::diameter::comm; -Engine::Engine() : - anna::app::Component(getClassName()), +Engine::Engine(const char *className, codec::Engine *baseProtocolCodecEngine) : + anna::app::Component(className), + a_baseProtocolCodecEngine(baseProtocolCodecEngine), a_autoBind(true), a_availableForEntities(false), a_availableForLocalServers(false), @@ -76,8 +49,7 @@ Engine::Engine() : // a_dwa(true), a_watchdogPeriod(ClientSession::DefaultWatchdogPeriod), a_maxConnectionDelay(anna::comm::ClientSocket::DefaultMaxConnectionDelay /* 200 ms*/), - a_numberOfClientSessionsPerServer(1), - a_freezeEndToEndOnSending(false) { + a_numberOfClientSessionsPerServer(1) { anna::diameter::sccs::activate(); a_realm = anna::functions::getDomainname(); a_host = anna::functions::getHostname(); @@ -254,7 +226,7 @@ throw(anna::RuntimeException) { result->a_engine = this; result->initializeStatisticConcepts(); - for(register int k = 0; k < a_numberOfClientSessionsPerServer; k++) + for(int k = 0; k < a_numberOfClientSessionsPerServer; k++) result->addClientSession(k); a_servers.insert(server_value_type(socket, result)); @@ -289,7 +261,7 @@ throw(anna::RuntimeException) { result->setWatchdogPeriod(a_watchdogPeriod); result->a_parent = server; result->a_socketId = socketId; - result->initializeSequences(); // después de asignar el server y el socketId (*) + result->initializeSequences(); // despu�s de asignar el server y el socketId (*) // (*) Las secuencias se basan en la semilla: srand(::time(NULL) + anna::functions::exclusiveHash(anna::functions::asString("%s:%d|%d", getAddress().c_str(), getPort(), a_socketId))); result->a_engine = this; clientSession_key key = ClientSession::getKey(server->getAddress(), server->getPort(), socketId); @@ -968,10 +940,10 @@ void Engine::readDPA(anna::DataBlock &dpa, const anna::DataBlock & dpr) throw() // [Error-Message].................................(281,0) // *[Failed-AVP]....................................(279,0) try { - anna::diameter::codec::Message diameterDPA; - anna::diameter::codec::Avp avpRC; - anna::diameter::codec::Avp avpOH; - anna::diameter::codec::Avp avpOR; + anna::diameter::codec::Message diameterDPA(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpRC(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpOH(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpOR(getBaseProtocolCodecEngine()); // Message header diameterDPA.setId(anna::diameter::helpers::base::COMMANDID__Disconnect_Peer_Answer); diameterDPA.setVersion(1); @@ -996,7 +968,10 @@ void Engine::readDPA(anna::DataBlock &dpa, const anna::DataBlock & dpr) throw() // Encode dpa = diameterDPA.code(); } catch(anna::RuntimeException &ex) { - ex.trace(); + std::string msg = ex.getText(); + msg += " | Use diameter::comm::Engine::setBaseProtocolCodecEngine() to allow internal base protocol messages encoding (unable to answer with DPA)"; + anna::Logger::error(msg, ANNA_FILE_LOCATION); + //throw anna::RuntimeException(msg, ANNA_FILE_LOCATION); } } @@ -1022,10 +997,10 @@ void Engine::readCEA(anna::DataBlock &cea, const anna::DataBlock & cer) throw() // [Firmware-Revision].............................(267,0) // *[AVP]...........................................(0,0) try { - anna::diameter::codec::Message diameterCEA; - anna::diameter::codec::Avp avpRC; - anna::diameter::codec::Avp avpOH; - anna::diameter::codec::Avp avpOR; + anna::diameter::codec::Message diameterCEA(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpRC(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpOH(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpOR(getBaseProtocolCodecEngine()); // Message header diameterCEA.setId(anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Answer); diameterCEA.setVersion(1); @@ -1059,7 +1034,10 @@ void Engine::readCEA(anna::DataBlock &cea, const anna::DataBlock & cer) throw() // Encode cea = diameterCEA.code(); } catch(anna::RuntimeException &ex) { - ex.trace(); + std::string msg = ex.getText(); + msg += " | Use diameter::comm::Engine::setBaseProtocolCodecEngine() to allow internal base protocol messages encoding (unable to answer with CEA)"; + anna::Logger::error(msg, ANNA_FILE_LOCATION); + //throw anna::RuntimeException(msg, ANNA_FILE_LOCATION); } } @@ -1075,10 +1053,10 @@ void Engine::readDWA(anna::DataBlock &dwa, const anna::DataBlock & dwr) throw() // *[Failed-AVP]....................................(279,0) // [Origin-State-Id]...............................(278,0) try { - anna::diameter::codec::Message diameterDWA; - anna::diameter::codec::Avp avpRC; - anna::diameter::codec::Avp avpOH; - anna::diameter::codec::Avp avpOR; + anna::diameter::codec::Message diameterDWA(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpRC(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpOH(getBaseProtocolCodecEngine()); + anna::diameter::codec::Avp avpOR(getBaseProtocolCodecEngine()); // Message header diameterDWA.setId(anna::diameter::helpers::base::COMMANDID__Device_Watchdog_Answer); diameterDWA.setVersion(1); @@ -1103,7 +1081,10 @@ void Engine::readDWA(anna::DataBlock &dwa, const anna::DataBlock & dwr) throw() // Encode dwa = diameterDWA.code(); } catch(anna::RuntimeException &ex) { - ex.trace(); + std::string msg = ex.getText(); + msg += " | Use diameter::comm::Engine::setBaseProtocolCodecEngine() to allow internal base protocol messages encoding (unable to answer with DWA)"; + anna::Logger::error(msg, ANNA_FILE_LOCATION); + //throw anna::RuntimeException(msg, ANNA_FILE_LOCATION); } }