X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fdiameter.comm%2FEntity.cpp;fp=source%2Fdiameter.comm%2FEntity.cpp;h=d48b13927d85942cbcb50e3c2d7f364daf16521e;hp=fc071486611f783c17d8653aa648a97703474739;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/diameter.comm/Entity.cpp b/source/diameter.comm/Entity.cpp index fc07148..d48b139 100644 --- a/source/diameter.comm/Entity.cpp +++ b/source/diameter.comm/Entity.cpp @@ -28,7 +28,7 @@ using namespace anna::diameter::comm; -void Entity::initialize() throw() { +void Entity::initialize() { a_engine = NULL; a_servers.clear(); // importante (el recycler creo que no lo tocaba) a_available = false; @@ -44,7 +44,7 @@ void Entity::initialize() throw() { } -void Entity::assertReady() throw(anna::RuntimeException) { +void Entity::assertReady() noexcept(false) { if(a_servers.size() != a_maxServers) { std::string msg(asString()); msg += " | Non-configured entity: you must add the remaining servers before any operation (bind, send, etc.)"; @@ -54,7 +54,7 @@ void Entity::assertReady() throw(anna::RuntimeException) { void Entity::addServer(const socket_t & serverId) -throw(anna::RuntimeException) { +noexcept(false) { if(a_servers.size() == a_maxServers) { LOGDEBUG ( @@ -75,7 +75,7 @@ throw(anna::RuntimeException) { } -int Entity::readSocketId(const Message* message, int maxClientSessions) const throw() { +int Entity::readSocketId(const Message* message, int maxClientSessions) const { if(a_sessionBasedModelsType == SessionBasedModelsType::RoundRobin) return -1; // IEC also would return -1 @@ -118,7 +118,7 @@ int Entity::readSocketId(const Message* message, int maxClientSessions) const th } -bool Entity::send(const Message* message) throw(anna::RuntimeException) { +bool Entity::send(const Message* message) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Entity", "send", ANNA_FILE_LOCATION)); assertReady(); // Carried socket id (forwarding/proxy features): @@ -201,7 +201,7 @@ bool Entity::send(const Message* message) throw(anna::RuntimeException) { return false; } -bool Entity::broadcast(const Message* message) throw(anna::RuntimeException) { +bool Entity::broadcast(const Message* message) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Entity", "broadcast", ANNA_FILE_LOCATION)); assertReady(); bool allok = true; @@ -221,7 +221,7 @@ bool Entity::broadcast(const Message* message) throw(anna::RuntimeException) { return allok; } -bool Entity::bind() throw(anna::RuntimeException) { +bool Entity::bind() noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Entity", "bind", ANNA_FILE_LOCATION)); assertReady(); bool result = true; // all OK return @@ -238,7 +238,7 @@ bool Entity::bind() throw(anna::RuntimeException) { return result; } -void Entity::raiseAutoRecovery(bool autoRecovery) throw(anna::RuntimeException) { +void Entity::raiseAutoRecovery(bool autoRecovery) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Entity", "raiseAutoRecovery", ANNA_FILE_LOCATION)); assertReady(); @@ -246,7 +246,7 @@ void Entity::raiseAutoRecovery(bool autoRecovery) throw(anna::RuntimeException) (*it)->raiseAutoRecovery(autoRecovery); } -void Entity::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) throw() { +void Entity::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond & millisecond) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Entity", "setClassCodeTimeout", ANNA_FILE_LOCATION)); assertReady(); @@ -261,7 +261,7 @@ void Entity::setClassCodeTimeout(const ClassCode::_v v, const anna::Millisecond // Private close/destroy method -void Entity::close(bool destroy) throw(anna::RuntimeException) { +void Entity::close(bool destroy) noexcept(false) { LOGMETHOD(anna::TraceMethod tttm("diameter::comm::Entity", "close", ANNA_FILE_LOCATION)); if(!a_engine) @@ -274,12 +274,12 @@ void Entity::close(bool destroy) throw(anna::RuntimeException) { } 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 Entity::getAddressPortList() const { socket_v result; for(std::vector::const_iterator it = begin(); it != end(); it++) { @@ -290,7 +290,7 @@ socket_v Entity::getAddressPortList() const throw() { return result; } -int Entity::getOTARequests() const throw() { +int Entity::getOTARequests() const { int result = 0; for(std::vector::const_iterator it = begin(); it != end(); it++) @@ -299,36 +299,36 @@ int Entity::getOTARequests() const throw() { return result; } -void Entity::childIdle() const throw() { +void Entity::childIdle() const { // Check father engine idleness: if(idle()) a_engine->eraseDeprecatedIdleEntities(); } -void Entity::hide() throw() { +void Entity::hide() { for(std::vector::iterator it = begin(); it != end(); it++) (*it)->hide(); } -void Entity::show() throw() { +void Entity::show() { for(std::vector::iterator it = begin(); it != end(); it++) (*it)->show(); } -bool Entity::hidden() const throw() { +bool Entity::hidden() const { for(std::vector::const_iterator it = begin(); it != end(); it++) if((*it)->shown()) return false; return true; } -bool Entity::shown() const throw() { +bool Entity::shown() const { for(std::vector::const_iterator it = begin(); it != end(); it++) if((*it)->hidden()) return false; return true; } -void Entity::eventPeerShutdown(const ClientSession* clientSession) throw() { +void Entity::eventPeerShutdown(const ClientSession* clientSession) { LOGWARNING( std::string msg(clientSession->asString()); msg += " | eventPeerShutdown"; @@ -336,7 +336,7 @@ void Entity::eventPeerShutdown(const ClientSession* clientSession) throw() { ); } -void Entity::eventRequestRetransmission(const ClientSession* clientSession, Message *request) throw() { +void Entity::eventRequestRetransmission(const ClientSession* clientSession, Message *request) { LOGWARNING( std::string msg(clientSession->asString()); @@ -348,7 +348,7 @@ void Entity::eventRequestRetransmission(const ClientSession* clientSession, Mess ); } -std::string Entity::asString() const throw() { +std::string Entity::asString() const { std::string result("diameter::comm::Entity { "); std::string originRealm = a_engine->getOriginRealmName(); std::string originHost = a_engine->getOriginHostName(); @@ -393,7 +393,7 @@ std::string Entity::asString() const throw() { return result; } -anna::xml::Node* Entity::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node* Entity::asXML(anna::xml::Node* parent) const { anna::xml::Node* result = parent->createChild("diameter.Entity"); std::string originRealm = a_engine->getOriginRealmName(); std::string originHost = a_engine->getOriginHostName(); @@ -422,7 +422,7 @@ anna::xml::Node* Entity::asXML(anna::xml::Node* parent) const throw() { return result; } -void Entity::availabilityLost() throw() { +void Entity::availabilityLost() { a_available = false; LOGDEBUG( std::string msg = "diameter::comm::Entity { Description: "; @@ -447,7 +447,7 @@ void Entity::availabilityLost() throw() { } -void Entity::availabilityRecovered() throw() { +void Entity::availabilityRecovered() { a_available = true; LOGDEBUG( std::string msg = "diameter::comm::Entity { Description: "; @@ -472,7 +472,7 @@ void Entity::availabilityRecovered() throw() { } -bool Entity::refreshAvailability() throw() { +bool Entity::refreshAvailability() { // Here available if(a_available) { // check not-bound state for all servers: bool isolate = true; @@ -501,7 +501,7 @@ bool Entity::refreshAvailability() throw() { //------------------------------------------------------------------------------ //----------------------------------------- Entity::updateIncomingActivityTime() //------------------------------------------------------------------------------ -void Entity::updateIncomingActivityTime() throw() { +void Entity::updateIncomingActivityTime() { a_lastIncomingActivityTime = anna::functions::millisecond(); LOGDEBUG ( @@ -515,7 +515,7 @@ void Entity::updateIncomingActivityTime() throw() { //------------------------------------------------------------------------------ //----------------------------------------- Entity::updateOutgoingActivityTime() //------------------------------------------------------------------------------ -void Entity::updateOutgoingActivityTime(void) throw() { +void Entity::updateOutgoingActivityTime(void) { a_lastOutgoingActivityTime = anna::functions::millisecond(); LOGDEBUG (