Fix retransmission issues (order, tracing, etc.)

[anna.git] / example / diameter / launcher / MyDiameterEntity.cpp

diff --git a/example/diameter/launcher/MyDiameterEntity.cpp b/example/diameter/launcher/MyDiameterEntity.cpp
index c69290d..d16974b 100644 (file)
--- a/example/diameter/launcher/MyDiameterEntity.cpp
+++ b/example/diameter/launcher/MyDiameterEntity.cpp
@@ -16,10 +16,33 @@
 #include "MyDiameterEntity.hpp"
 #include "Launcher.hpp"
 
-// Auxiliary message for sendings
-extern anna::diameter::comm::Message G_commMsgSent2e, G_commMsgFwd2c;
-extern anna::diameter::codec::Message G_codecMsg, G_codecAnsMsg;
-extern anna::Recycler<anna::diameter::comm::Message> G_commMessages; // create on requests forwards without programmed answer / release in answers forward
+
+void MyDiameterEntity::eventRequestRetransmission(const anna::diameter::comm::ClientSession* clientSession, anna::diameter::comm::Message *request) throw() {
+
+  LOGMETHOD(anna::TraceMethod tm("launcher::MyDiameterEntity", "eventRequestRetransmission", ANNA_FILE_LOCATION));
+
+  // Base class:
+  Entity::eventRequestRetransmission(clientSession, request); // warning trace
+
+  // Performance stats:
+  Launcher& my_app = static_cast <Launcher&>(anna::app::functions::getApp());
+  CommandLine& cl(anna::CommandLine::instantiate());
+  // CommandId:
+  anna::diameter::CommandId cid = anna::diameter::codec::functions::getCommandId(request->getBody());
+  LOGDEBUG
+  (
+    std::string msg = "Request retransmitted: ";
+    msg += anna::diameter::functions::commandIdAsPairString(cid);
+    msg += " | DiameterServer: ";
+    msg += anna::functions::socketLiteralAsString(clientSession->getAddress(), clientSession->getPort());
+    msg += " | EventTime: ";
+    msg += anna::time::functions::currentTimeAsString();
+    anna::Logger::debug(msg, ANNA_FILE_LOCATION);
+  );
+
+  // Write retransmission
+  if(my_app.logEnabled()) my_app.writeLogFile(request->getBody(), "retry", clientSession->asString(), a_codecEngine);
+}
 
 
 void MyDiameterEntity::eventRequest(anna::diameter::comm::ClientSession *clientSession, const anna::DataBlock &message)
@@ -42,7 +65,7 @@ throw(anna::RuntimeException) {
   );
 
   // Write reception
-  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfe", clientSession->asString());
+  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfe", clientSession->asString(), a_codecEngine);
 
   // Lookup reacting answers list:
   int code = cid.first;
@@ -52,8 +75,10 @@ throw(anna::RuntimeException) {
     my_app.getCommunicator()->prepareAnswer(answer_message, message);
 
     try {
-      G_commMsgSent2e.setBody(answer_message->code());
-      /* response = NULL =*/clientSession->send(&G_commMsgSent2e);
+      anna::diameter::comm::Message *msg = my_app.createCommMessage();
+      msg->setBody(answer_message->code());
+      /* response = NULL =*/clientSession->send(msg);
+      my_app.releaseCommMessage(msg);
 
       if(my_app.logEnabled()) my_app.writeLogFile(*answer_message, "sent2e", clientSession->asString());
     } catch(anna::RuntimeException &ex) {
@@ -80,8 +105,8 @@ throw(anna::RuntimeException) {
 
   if(localServer && (cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) /* don't forward CER */) {
     try {
-      anna::diameter::comm::Message *msg = G_commMessages.create();
-      msg->updateEndToEnd(false); // end-to-end will be kept
+      anna::diameter::comm::Message *msg = my_app.createCommMessage();
+      msg->forwardEndToEnd(); // end-to-end will be kept
       msg->setBody(message);
       msg->setRequestClientSessionKey(clientSession->getKey());
       bool success = localServer->send(msg);
@@ -90,7 +115,7 @@ throw(anna::RuntimeException) {
       if(my_app.logEnabled()) {
         anna::diameter::comm::ServerSession *usedServerSession = localServer->getLastUsedResource();
         std::string detail = usedServerSession ? usedServerSession->asString() : "<null server session>"; // esto no deberia ocurrir
-        my_app.writeLogFile(message, (success ? "fwd2c" : "fwd2cError"), detail);
+        my_app.writeLogFile(message, (success ? "fwd2c" : "fwd2cError"), detail, a_codecEngine);
       }
     } catch(anna::RuntimeException &ex) {
       ex.trace();
@@ -138,7 +163,7 @@ throw(anna::RuntimeException) {
     LOGWARNING(anna::Logger::warning("Context Expired for Diameter Request which was sent to the entity", ANNA_FILE_LOCATION));
 
     if(request_cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) {  // don't trace CEA
-      if(my_app.logEnabled()) my_app.writeLogFile(*request, "req2e-expired", clientSession->asString());
+      if(my_app.logEnabled()) my_app.writeLogFile(*request, "req2e-expired", clientSession->asString(), a_codecEngine);
     }
   }
 
@@ -148,13 +173,11 @@ throw(anna::RuntimeException) {
       msg += anna::diameter::functions::commandIdAsPairString(request_cid);
       anna::Logger::debug(msg, ANNA_FILE_LOCATION);
     );
-    // Write reception
-    bool alreadyDecodedOnG_codecMsg = false;
 
+    // Write reception
     if(request_cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) {  // don't trace CEA
       if(my_app.logEnabled()) {
-        my_app.writeLogFile(*message, "recvfe", clientSession->asString());
-        alreadyDecodedOnG_codecMsg = true;
+        my_app.writeLogFile(*message, "recvfe", clientSession->asString(), a_codecEngine);
       }
     }
 
@@ -163,19 +186,19 @@ throw(anna::RuntimeException) {
 
     if(localServer && (request_cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) /* don't forward CEA */) {
       try {
-        G_commMsgFwd2c.updateEndToEnd(false); // end-to-end will be kept
-        G_commMsgFwd2c.setBody(*message);
-        bool success = localServer->send(&G_commMsgFwd2c, request->getRequestServerSessionKey());
-        G_commMessages.release(request);
+        anna::diameter::comm::Message *msg = my_app.createCommMessage();
+        msg->forwardEndToEnd(); // end-to-end will be kept
+        msg->setBody(*message);
+        bool success = localServer->send(msg, request->getRequestServerSessionKey());
+        my_app.releaseCommMessage(msg);
+        my_app.releaseCommMessage(request);
+
         // Detailed log:
         anna::diameter::comm::ServerSession *usedServerSession = my_app.getMyDiameterEngine()->findServerSession(request->getRequestServerSessionKey());
         std::string detail = usedServerSession ? usedServerSession->asString() : "<null server session>"; // esto no deberia ocurrir
 
         if(my_app.logEnabled()) {
-          if(alreadyDecodedOnG_codecMsg)
-            my_app.writeLogFile(G_codecMsg, (success ? "fwd2c" : "fwd2cError"), detail);
-          else
-            my_app.writeLogFile(*message, (success ? "fwd2c" : "fwd2cError"), detail);
+          my_app.writeLogFile(*message, (success ? "fwd2c" : "fwd2cError"), detail, a_codecEngine);
         }
       } catch(anna::RuntimeException &ex) {
         ex.trace();
@@ -206,7 +229,7 @@ throw(anna::RuntimeException) {
   );
 
   // Write reception
-  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfe-ans-unknown", clientSession->asString());
+  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfe-ans-unknown", clientSession->asString(), a_codecEngine);
 }
 
 void MyDiameterEntity::eventDPA(anna::diameter::comm::ClientSession *clientSession, const anna::DataBlock &message)
@@ -228,5 +251,5 @@ throw(anna::RuntimeException) {
   );
 
   // Write reception
-  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfe", clientSession->asString());
+  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfe", clientSession->asString(), a_codecEngine);
 }