X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FMyLocalServer.cpp;h=599917f78d741bf35266b3c9248ec9f5fd196ef2;hb=129af2a9a7c287843be5bd443c5b1ad9b08438a8;hp=9346c5d5dc81222d9182c02bbeb4aee1319fec9d;hpb=129500a50678c43ff28fb0054d6197899b8c0b2c;p=anna.git

diff --git a/example/diameter/launcher/MyLocalServer.cpp b/example/diameter/launcher/MyLocalServer.cpp
index 9346c5d..599917f 100644
--- a/example/diameter/launcher/MyLocalServer.cpp
+++ b/example/diameter/launcher/MyLocalServer.cpp
@@ -38,7 +38,7 @@ throw(anna::RuntimeException) {
   );
 
   // Write reception
-  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfc", serverSession->asString());
+  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfc", serverSession->asString(), a_codecEngine);
 
   // If no answer is programmed and entity is configured, the failed request would be forwarded even being wrong (delegates at the end point)
   int code = cid.first;
@@ -48,7 +48,7 @@ throw(anna::RuntimeException) {
   anna::diameter::comm::Entity *entity = my_app.getEntity();
   if(!programmed && entity) {  // forward condition (no programmed answer + entity available)
     anna::diameter::comm::Message *msg = my_app.createCommMessage();
-    msg->updateEndToEnd(false); // end-to-end will be kept
+    msg->forwardEndToEnd(); // end-to-end will be kept
     msg->setBody(message);
     msg->setRequestServerSessionKey(serverSession->getKey());
     bool success = entity->send(msg, cl.exists("balance"));
@@ -58,7 +58,7 @@ throw(anna::RuntimeException) {
       anna::diameter::comm::Server *usedServer = entity->getLastUsedResource();
       anna::diameter::comm::ClientSession *usedClientSession = usedServer ? usedServer->getLastUsedResource() : NULL;
       std::string detail = usedClientSession ? usedClientSession->asString() : "<null client session>"; // esto no deberia ocurrir
-      my_app.writeLogFile(message, (success ? "fwd2e" : "fwd2eError"), detail); // forwarded
+      my_app.writeLogFile(message, (success ? "fwd2e" : "fwd2eError"), detail, a_codecEngine); // forwarded
     }
 
     return;
@@ -67,17 +67,17 @@ throw(anna::RuntimeException) {
   // Error analisys:
   bool analysisOK = true; // by default
   anna::diameter::codec::Message *answer_message = NULL;
-  anna::diameter::codec::Message *codecMsg = my_app.createCodecMessage();
+  anna::diameter::codec::Message codecMsg(a_codecEngine);
+  anna::diameter::codec::Message codecAnsMsg(a_codecEngine);
 
   if(!cl.exists("ignoreErrors")) {  // Error analysis
-    answer_message = my_app.createCodecMessage();
+    answer_message = (anna::diameter::codec::Message *)&codecAnsMsg;
     answer_message->clear();
 
     // Decode
-    try { codecMsg->decode(message, answer_message); } catch(anna::RuntimeException &ex) { ex.trace(); }
+    try { codecMsg.decode(message, answer_message); } catch(anna::RuntimeException &ex) { ex.trace(); }
 
-    answer_message->setStandardToAnswer(*codecMsg, my_app.getMyDiameterEngine()->getHost(), my_app.getMyDiameterEngine()->getRealm());
-    my_app.releaseCodecMessage(codecMsg);
+    answer_message->setStandardToAnswer(codecMsg, my_app.getMyDiameterEngine()->getHost(), my_app.getMyDiameterEngine()->getRealm());
     analysisOK = (answer_message->getResultCode() == anna::diameter::helpers::base::AVPVALUES__Result_Code::DIAMETER_SUCCESS);
   }
 
@@ -90,11 +90,10 @@ throw(anna::RuntimeException) {
     } else return; // nothing done
   }
 
-  anna::diameter::codec::Engine *codecEngine = my_app.getCodecEngine();
-  anna::diameter::codec::Engine::ValidationMode::_v backupVM = codecEngine->getValidationMode();
+  anna::diameter::codec::Engine::ValidationMode::_v backupVM = a_codecEngine->getValidationMode();
 
   if(!analysisOK)
-    codecEngine->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Never);
+    a_codecEngine->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Never);
 
   try {
     anna::diameter::comm::Message *msg = my_app.createCommMessage();
@@ -108,11 +107,8 @@ throw(anna::RuntimeException) {
     if(my_app.logEnabled()) my_app.writeLogFile(*answer_message, "send2cError", serverSession->asString());
   }
 
-  // Release auxiliary codec message
-  my_app.releaseCodecMessage(answer_message);
-
   // Restore validation mode
-  codecEngine->setValidationMode(backupVM);
+  a_codecEngine->setValidationMode(backupVM);
 
   // Pop front the reacting answer:
   if(analysisOK && programmed) a_reactingAnswers.nextMessage(code);
@@ -158,7 +154,7 @@ throw(anna::RuntimeException) {
     LOGWARNING(anna::Logger::warning("Context Expired for Diameter Request which was sent to the client", 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, "req2c-expired", serverSession->asString());
+      if(my_app.logEnabled()) my_app.writeLogFile(*request, "req2c-expired", serverSession->asString(), a_codecEngine);
     }
   }
 
@@ -170,7 +166,7 @@ throw(anna::RuntimeException) {
     );
 
     // Write reception
-    if(my_app.logEnabled()) my_app.writeLogFile(*message, "recvfc", serverSession->asString());
+    if(my_app.logEnabled()) my_app.writeLogFile(*message, "recvfc", serverSession->asString(), a_codecEngine);
 
     // This is not very usual, but answers could arrive from clients:
     anna::diameter::comm::Entity *entity = my_app.getEntity();
@@ -183,7 +179,7 @@ throw(anna::RuntimeException) {
 
       try {
         anna::diameter::comm::Message *msg = my_app.createCommMessage();
-        msg->updateEndToEnd(false); // end-to-end will be kept
+        msg->forwardEndToEnd(); // end-to-end will be kept
         msg->setBody(*message);
 
         // Metodo 1:
@@ -196,10 +192,10 @@ throw(anna::RuntimeException) {
         my_app.releaseCommMessage(msg);
         my_app.releaseCommMessage(request);
 
-        if(my_app.logEnabled()) my_app.writeLogFile(*message, "fwd2e", detail);  // forwarded
+        if(my_app.logEnabled()) my_app.writeLogFile(*message, "fwd2e", detail, a_codecEngine);  // forwarded
       } catch(anna::RuntimeException &ex) {
         ex.trace();
-        if(my_app.logEnabled()) my_app.writeLogFile(*message, "fwd2eError", detail);  // forwarded
+        if(my_app.logEnabled()) my_app.writeLogFile(*message, "fwd2eError", detail, a_codecEngine);  // forwarded
       }
     }
   }
@@ -223,7 +219,7 @@ throw(anna::RuntimeException) {
     anna::Logger::debug(msg, ANNA_FILE_LOCATION);
   );
 
-  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfc-ans-unknown", serverSession->asString());
+  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfc-ans-unknown", serverSession->asString(), a_codecEngine);
 }
 
 void MyLocalServer::eventDPA(anna::diameter::comm::ServerSession *serverSession, const anna::DataBlock &message)
@@ -244,5 +240,5 @@ throw(anna::RuntimeException) {
     anna::Logger::debug(msg, ANNA_FILE_LOCATION);
   );
 
-  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfc", serverSession->asString());
+  if(my_app.logEnabled()) my_app.writeLogFile(message, "recvfc", serverSession->asString(), a_codecEngine);
 }