X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter.comm%2FClientSession.cpp;h=8adb77b86e7629f41c2c3eda7e26d01690ba8ab4;hb=6c4aae8b2e861a6cbca6962611624a5aadadd6ad;hp=73d097a40f7c7d67ec28d3c7435c4324175af407;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/diameter.comm/ClientSession.cpp b/source/diameter.comm/ClientSession.cpp
index 73d097a..8adb77b 100644
--- a/source/diameter.comm/ClientSession.cpp
+++ b/source/diameter.comm/ClientSession.cpp
@@ -1,8 +1,8 @@
-// ANNA - Anna is Not 'N' Anymore
+// ANNA - Anna is Not Nothingness Anymore
 //
 // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
 //
-// https://bitbucket.org/testillano/anna
+// http://redmine.teslayout.com/projects/anna-suite
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -14,7 +14,7 @@
 // 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
+//     *  Neither the name of the copyright holder nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
@@ -140,6 +140,10 @@ void ClientSession::bind() throw(anna::RuntimeException) {
     return;
   }
 
+  // Some operations could be done before sending CER, for example non-standard Origin-Host manipulation for
+  // Tekelec PCRF
+  a_engine->bindingClientSession(this);
+
   // OAM Lo comento, porque no se contabilizan los reintentos y por lo tanto no son muy útiles.
 //  OamModule &oamModule = OamModule::instantiate();
 //  oamModule.count(a_server->isAvailable() ? OamModule::Counter::TCPConnectOK:OamModule::Counter::TCPConnectNOK);
@@ -478,6 +482,11 @@ void ClientSession::eventUnknownResponse(const anna::DataBlock& response) throw(
   a_parent->eventUnknownResponse(this, response);
 }
 
+void ClientSession::eventDPA(const anna::DataBlock& response) throw(anna::RuntimeException) {
+  // Inform father server:
+  a_parent->eventDPA(this, response);
+}
+
 
 
 //------------------------------------------------------------------------------------------
@@ -578,7 +587,10 @@ throw(anna::RuntimeException) {
     }
 
     if(resultCode != helpers::base::AVPVALUES__Result_Code::DIAMETER_SUCCESS) {
-      LOGWARNING(anna::Logger::warning("Received CEA with non-success Result-Code. Unbinding connection.", ANNA_FILE_LOCATION));
+      LOGWARNING(
+        std::string msg = anna::functions::asString("Received CEA with non-success Result-Code (%d). Unbinding connection.", resultCode);
+        anna::Logger::warning(msg, ANNA_FILE_LOCATION);
+      );
       doUnbind = true;
     } else {
       setState(State::Bound);
@@ -594,7 +606,10 @@ throw(anna::RuntimeException) {
     setWatchdogState(WatchdogState::WaitingTimerExpiration);
 
     if(resultCode != helpers::base::AVPVALUES__Result_Code::DIAMETER_SUCCESS)
-      LOGWARNING(anna::Logger::warning("Received DWA with non-success Result-Code... but ASSUME keep-alive is reached", ANNA_FILE_LOCATION));
+      LOGWARNING(
+        std::string msg = anna::functions::asString("Received DWA with non-success Result-Code (%d)... but ASSUME keep-alive is reached", resultCode);
+        anna::Logger::warning(msg, ANNA_FILE_LOCATION);
+      );
 
     if(a_state == State::Failover) {
       setState(State::Bound);
@@ -615,7 +630,10 @@ throw(anna::RuntimeException) {
 
     if(a_state == State::WaitingDPA) {
       if(resultCode != helpers::base::AVPVALUES__Result_Code::DIAMETER_SUCCESS) {
-        LOGWARNING(anna::Logger::warning("Received DPA with non-success Result-Code. Ignoring and recovering Bound state", ANNA_FILE_LOCATION));
+        LOGWARNING(
+          std::string msg = anna::functions::asString("Received DPA with non-success Result-Code (%d). Ignoring and recovering Bound state", resultCode);
+          anna::Logger::warning(msg, ANNA_FILE_LOCATION);
+        );
         setState(State::Bound);
       } else {
         LOGWARNING(anna::Logger::warning("Received DPA With Result-Code = DIAMETER_SUCCESS. Disconnect now.", ANNA_FILE_LOCATION));
@@ -666,7 +684,6 @@ throw(anna::RuntimeException) {
   requestMessage->setRequestServerSessionKey(response->getRequest()->getRequestServerSessionKey()); // -1 means unkown/unset
 
   if(cid != helpers::base::COMMANDID__Disconnect_Peer_Answer) {
-    // don't progress DPA: unbind is automatically performed and not open to any application decision
     try {
       response->setMessage(&db);
       // Restore received datablock
@@ -685,6 +702,11 @@ throw(anna::RuntimeException) {
       ex.trace();
     }
   }
+  else { // DPA
+    // unbind is automatically performed, anyway we can inform to the application just in case some additional
+    //  procedure could be issued:
+    eventDPA(db);
+  }
 
   response_erase(response);