a_description = "";
a_category = 0;
a_lastUsedResource = NULL;
+ a_balance = false;
+ a_sessionBasedModelsType = SessionBasedModelsType::SessionIdLowPart;
}
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;
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:
}
-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):
////////////////////////////////////////////////////////////////////////////////////////
// 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();
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;
std::string Entity::asString() const throw() {
std::string result("diameter::comm::Entity { ");
- std::string originRealm = a_engine->getOriginRealm();
- std::string originHost = a_engine->getOriginHost();
+ std::string originRealm = a_engine->getOriginRealmName();
+ std::string originHost = a_engine->getOriginHostName();
result += "Parent Engine Origin-Realm: ";
- result += (originRealm != "") ? originRealm:"<not configured>";
+ result += (originRealm != "") ? originRealm:"[not configured]";
result += " | Parent Engine Origin-Host: ";
- result += (originHost != "") ? originHost:"<not configured>";
+ 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++) {
anna::xml::Node* Entity::asXML(anna::xml::Node* parent) const throw() {
anna::xml::Node* result = parent->createChild("diameter.Entity");
- std::string originRealm = a_engine->getOriginRealm();
- std::string originHost = a_engine->getOriginHost();
+ std::string originRealm = a_engine->getOriginRealmName();
+ std::string originHost = a_engine->getOriginHostName();
if(originRealm != "") result->createAttribute("ParentEngineOriginRealm", originRealm);
if(originHost != "") result->createAttribute("ParentEngineOriginHost", originHost);
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++)