-void Entity::initialize() throw() {
+void Entity::initialize() {
a_engine = NULL;
a_servers.clear(); // importante (el recycler creo que no lo tocaba)
a_available = false;
a_description = "";
a_category = 0;
a_lastUsedResource = NULL;
+ a_balance = false;
+ a_sessionBasedModelsType = SessionBasedModelsType::SessionIdLowPart;
}
-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.)";
void Entity::addServer(const socket_t & serverId)
-throw(anna::RuntimeException) {
+noexcept(false) {
if(a_servers.size() == a_maxServers) {
LOGDEBUG
(
}
-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
+
try {
// Service-Context-Id:
anna::diameter::helpers::dcca::ChargingContext::_v chargingContext;
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(
}
-bool Entity::send(const Message* message, bool balance) 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):
////////////////////////////////////////////////////////////////////////////////////////
// Balance
- if(balance) {
+ 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();
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;
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
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();
(*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();
// 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)
a_engine->closeServer(*it, destroy);
}
+const char* Entity::asText(const SessionBasedModelsType::_v sbmt)
+{
+ 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<Server*>::const_iterator it = begin(); it != end(); it++) {
return result;
}
-int Entity::getOTARequests() const throw() {
+int Entity::getOTARequests() const {
int result = 0;
for(std::vector<Server*>::const_iterator it = begin(); it != end(); it++)
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<Server*>::iterator it = begin(); it != end(); it++)
(*it)->hide();
}
-void Entity::show() throw() {
+void Entity::show() {
for(std::vector<Server*>::iterator it = begin(); it != end(); it++)
(*it)->show();
}
-bool Entity::hidden() const throw() {
+bool Entity::hidden() const {
for(std::vector<Server*>::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<Server*>::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";
);
}
-void Entity::eventRequestRetransmission(const ClientSession* clientSession, Message *request) throw() {
+void Entity::eventRequestRetransmission(const ClientSession* clientSession, Message *request) {
LOGWARNING(
std::string msg(clientSession->asString());
- msg += " | eventRequestRetransmission";
+
+ 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 Entity::asString() const {
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:"[not configured]";
+ result += " | Parent Engine Origin-Host: ";
+ result += (originHost != "") ? originHost:"[not configured]";
result += " | Category: ";
result += anna::functions::asString(a_category);
result += a_lastOutgoingActivityTime.asString();
result += " | Hidden: ";
result += (hidden() ? "yes" : "no");
+ result += " | SessionBasedModelsType: ";
+ result += asText(a_sessionBasedModelsType);
result += "\n";
for(std::vector<Server*>::const_iterator it = begin(); it != end(); it++) {
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 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));
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<Server*>::const_iterator it = begin(); it != end(); it++)
return result;
}
-void Entity::availabilityLost() throw() {
+void Entity::availabilityLost() {
a_available = false;
LOGDEBUG(
std::string msg = "diameter::comm::Entity { Description: ";
oamModule.count(OamModule::Counter::LostAvailabilityOverEntity);
}
- a_engine->availabilityLost(this);
a_engine->refreshAvailabilityForEntities();
}
-void Entity::availabilityRecovered() throw() {
+void Entity::availabilityRecovered() {
a_available = true;
LOGDEBUG(
std::string msg = "diameter::comm::Entity { Description: ";
oamModule.count(OamModule::Counter::RecoveredAvailabilityOverEntity);
}
- a_engine->availabilityRecovered(this);
a_engine->refreshAvailabilityForEntities();
}
-bool Entity::refreshAvailability() throw() {
+bool Entity::refreshAvailability() {
// Here available
if(a_available) { // check not-bound state for all servers:
bool isolate = true;
//------------------------------------------------------------------------------
//----------------------------------------- Entity::updateIncomingActivityTime()
//------------------------------------------------------------------------------
-void Entity::updateIncomingActivityTime() throw() {
+void Entity::updateIncomingActivityTime() {
a_lastIncomingActivityTime = anna::functions::millisecond();
LOGDEBUG
(
//------------------------------------------------------------------------------
//----------------------------------------- Entity::updateOutgoingActivityTime()
//------------------------------------------------------------------------------
-void Entity::updateOutgoingActivityTime(void) throw() {
+void Entity::updateOutgoingActivityTime(void) {
a_lastOutgoingActivityTime = anna::functions::millisecond();
LOGDEBUG
(
projects / anna.git / blobdiff