X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FEntity.cpp;h=d5b3dd398ce50e7eaf7b19972c7a2fbc6022ddac;hb=d723d5bf571eb48c641b092058eaa38bb6c4fcc8;hp=2ef5f180e8322aa0252da0834f06e0202ee677c7;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/diameter.comm/Entity.cpp b/source/diameter.comm/Entity.cpp index 2ef5f18..d5b3dd3 100644 --- a/source/diameter.comm/Entity.cpp +++ b/source/diameter.comm/Entity.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 @@ -67,6 +39,7 @@ void Entity::initialize() throw() { a_description = ""; a_category = 0; a_lastUsedResource = NULL; + a_balance = false; } @@ -102,6 +75,9 @@ throw(anna::RuntimeException) { int Entity::readSocketId(const Message* message, int maxClientSessions) const throw() { + + if(a_sessionBasedModelsType == SessionBasedModelsType::RoundRobin) return -1; // IEC also would return -1 + try { // Service-Context-Id: anna::diameter::helpers::dcca::ChargingContext::_v chargingContext; @@ -116,12 +92,18 @@ int Entity::readSocketId(const Message* message, int maxClientSessions) const th std::string diameterIdentity, optional; anna::U32 high, low; anna::diameter::helpers::base::functions::decodeSessionId(sid, diameterIdentity, high, low /* context-teid */, optional); - return (low % maxClientSessions); + + if(a_sessionBasedModelsType == SessionBasedModelsType::SessionIdLowPart) return (low % maxClientSessions); + + if(a_sessionBasedModelsType == SessionBasedModelsType::SessionIdHighPart) return (high % maxClientSessions); + + if(a_sessionBasedModelsType == SessionBasedModelsType::SessionIdOptionalPart) return (atoi(optional.c_str()) % maxClientSessions); } - //case anna::diameter::helpers::dcca::ChargingContext::SMS: - //case anna::diameter::helpers::dcca::ChargingContext::MMS: - //default: - // return -1; // IEC model and Unknown traffic types + case anna::diameter::helpers::dcca::ChargingContext::SMS: + case anna::diameter::helpers::dcca::ChargingContext::MMS: + case anna::diameter::helpers::dcca::ChargingContext::Unknown: + default: + return -1; // IEC model and Unknown traffic types } } catch(anna::RuntimeException &ex) { LOGDEBUG( @@ -135,7 +117,7 @@ int Entity::readSocketId(const Message* message, int maxClientSessions) const th } -bool Entity::send(const Message* message, bool balance) throw(anna::RuntimeException) { +bool Entity::send(const Message* message) throw(anna::RuntimeException) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Entity", "send", ANNA_FILE_LOCATION)); assertReady(); // Carried socket id (forwarding/proxy features): @@ -164,8 +146,8 @@ bool Entity::send(const Message* message, bool balance) throw(anna::RuntimeExcep //////////////////////////////////////////////////////////////////////////////////////// // Balance - if(balance) { - for(register int k = 0; k < getMaxServers(); k++) { // try round-robin only over one cycle, + if(a_balance) { + for(int k = 0; k < getMaxServers(); k++) { // try round-robin only over one cycle, // no matter where you are: don't repeat same server if(a_deliveryIterator == end()) a_deliveryIterator = begin(); @@ -290,6 +272,11 @@ void Entity::close(bool destroy) throw(anna::RuntimeException) { a_engine->closeServer(*it, destroy); } +const char* Entity::asText(const SessionBasedModelsType::_v sbmt) +throw() { + static const char* text [] = { "RoundRobin", "SessionIdOptionalPart", "SessionIdHighPart", "SessionIdLowPart" }; + return text [sbmt]; +} socket_v Entity::getAddressPortList() const throw() { socket_v result; @@ -348,14 +335,27 @@ void Entity::eventPeerShutdown(const ClientSession* clientSession) throw() { ); } +void Entity::eventRequestRetransmission(const ClientSession* clientSession, Message *request) throw() { + LOGWARNING( + std::string msg(clientSession->asString()); + + HopByHop hopByHop = codec::functions::getHopByHop(request->getBody()); // context identification + int retries = request->getRetries(); + + msg += anna::functions::asString(" | eventRequestRetransmission: request with application HopByHop: %u; remaining %d retries", hopByHop, retries); + anna::Logger::warning(msg, ANNA_FILE_LOCATION); + ); +} + std::string Entity::asString() const throw() { std::string result("diameter::comm::Entity { "); - std::string realm = a_engine->getRealm(); + std::string originRealm = a_engine->getOriginRealmName(); + std::string originHost = a_engine->getOriginHostName(); - if(realm != "") { - result += "Parent Engine (realm): "; - result += realm; - } + result += "Parent Engine Origin-Realm: "; + result += (originRealm != "") ? originRealm:""; + result += " | Parent Engine Origin-Host: "; + result += (originHost != "") ? originHost:""; result += " | Category: "; result += anna::functions::asString(a_category); @@ -380,6 +380,8 @@ std::string Entity::asString() const throw() { result += a_lastOutgoingActivityTime.asString(); result += " | Hidden: "; result += (hidden() ? "yes" : "no"); + result += " | SessionBasedModelsType: "; + result += asText(a_sessionBasedModelsType); result += "\n"; for(std::vector::const_iterator it = begin(); it != end(); it++) { @@ -392,9 +394,11 @@ std::string Entity::asString() const throw() { anna::xml::Node* Entity::asXML(anna::xml::Node* parent) const throw() { anna::xml::Node* result = parent->createChild("diameter.Entity"); - std::string realm = a_engine->getRealm(); + std::string originRealm = a_engine->getOriginRealmName(); + std::string originHost = a_engine->getOriginHostName(); - if(realm != "") result->createAttribute("ParentEngineRealm", realm); + if(originRealm != "") result->createAttribute("ParentEngineOriginRealm", originRealm); + if(originHost != "") result->createAttribute("ParentEngineOriginHost", originHost); result->createAttribute("Category", anna::functions::asString(a_category)); @@ -408,6 +412,7 @@ anna::xml::Node* Entity::asXML(anna::xml::Node* parent) const throw() { result->createAttribute("LastIncomingActivityTime", a_lastIncomingActivityTime.asString()); result->createAttribute("LastOutgoingActivityTime", a_lastOutgoingActivityTime.asString()); result->createAttribute("Hidden", hidden() ? "yes" : "no"); + result->createAttribute("SessionBasedModelsType:", asText(a_sessionBasedModelsType)); anna::xml::Node* servers = result->createChild("Entity.Servers"); for(std::vector::const_iterator it = begin(); it != end(); it++)