X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FEntity.cpp;h=fc071486611f783c17d8653aa648a97703474739;hb=e782294456d0877aa8fc05aa931291ac79808eb3;hp=17c1ebf9cff2066b076cb1de96c3e00d79e5deb6;hpb=84c30c372cf2926a138a6d51a52d56f3b2a63804;p=anna.git

diff --git a/source/diameter.comm/Entity.cpp b/source/diameter.comm/Entity.cpp
index 17c1ebf..fc07148 100644
--- a/source/diameter.comm/Entity.cpp
+++ b/source/diameter.comm/Entity.cpp
@@ -39,6 +39,8 @@ void Entity::initialize() throw() {
   a_description = "";
   a_category = 0;
   a_lastUsedResource = NULL;
+  a_balance = false;
+  a_sessionBasedModelsType = SessionBasedModelsType::SessionIdLowPart;
 }
 
 
@@ -74,6 +76,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;
@@ -88,7 +93,12 @@ 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:
@@ -108,7 +118,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):
@@ -137,7 +147,7 @@ bool Entity::send(const Message* message, bool balance) throw(anna::RuntimeExcep
   ////////////////////////////////////////////////////////////////////////////////////////
 
   // 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();
@@ -263,6 +273,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;
@@ -335,12 +350,13 @@ void Entity::eventRequestRetransmission(const ClientSession* clientSession, Mess
 
 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:"[not configured]";
+  result += " | Parent Engine Origin-Host: ";
+  result += (originHost != "") ? originHost:"[not configured]";
 
   result += " | Category: ";
   result += anna::functions::asString(a_category);
@@ -365,6 +381,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<Server*>::const_iterator it = begin(); it != end(); it++) {
@@ -377,9 +395,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));
 
@@ -393,6 +413,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<Server*>::const_iterator it = begin(); it != end(); it++)