X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Ftesting%2FTestStep.cpp;h=fdbd7989fc8a3374e52dc728919f3028913cb7b8;hb=51a6c4b326153804233788bd8fda4966052d4288;hp=d02d9b6aa98ebcb8568b8aad149c0775aae0eec0;hpb=786b2fe6e2363dc5af619526208583c61f18f70b;p=anna.git

diff --git a/example/diameter/launcher/testing/TestStep.cpp b/example/diameter/launcher/testing/TestStep.cpp
index d02d9b6..fdbd798 100644
--- a/example/diameter/launcher/testing/TestStep.cpp
+++ b/example/diameter/launcher/testing/TestStep.cpp
@@ -177,10 +177,14 @@ void TestStep::initialize(TestCase *testCase) {
   a_number = testCase->steps() + 1; // testCase is not NULL
 }
 
-bool TestStep::decodeMessage() throw() {
+bool TestStep::decodeMessage(bool trust) throw() {
   if (a_messageCodec) return true;
   a_messageCodec = new anna::diameter::codec::Message;
   if (::decodeMessage(a_message, *a_messageCodec)) return true;
+  if (trust) {
+    LOGDEBUG(anna::Logger::debug("Error DECODING, but trusting it ...", ANNA_FILE_LOCATION));
+    return true;
+  }
 
   delete a_messageCodec;
   a_messageCodec = NULL;
@@ -349,41 +353,49 @@ throw() {
 
 bool TestStepSendxml::do_execute() throw() {
   bool success = false;
-  std::string failReason, s_warn;
+  std::string failReason;
   MyDiameterEntity *entity = a_originHost->getEntity(); // by default
   MyLocalServer *localServer = a_originHost->getDiameterServer(); // by default
   const TestStepWait *tsw = NULL;
-
-  // Create comm message:
   anna::diameter::comm::Message *msg = a_originHost->createCommMessage();
-  //msg->clearBody();
-  msg->setBody(a_message);
 
   try {
-    // Update sequence for answers:
-    if (a_waitForRequestStepNumber != -1) { // is an answer: try to copy sequence information; alert about Session-Id discrepance
-      // Request which was received:
-      tsw = static_cast<const TestStepWait*>(a_testCase->getStep(a_waitForRequestStepNumber));
 
-      const anna::DataBlock &request = tsw->getMsgDataBlock();
-      anna::diameter::HopByHop hbh = anna::diameter::codec::functions::getHopByHop(request);
-      anna::diameter::EndToEnd ete = anna::diameter::codec::functions::getEndToEnd(request);
+    if (a_waitForRequestStepNumber != -1) {
 
-      // Update sequence:
-      anna::diameter::codec::functions::setHopByHop(a_message, hbh);
-      anna::diameter::codec::functions::setEndToEnd(a_message, ete);
+      // Referenced request in the 'wait for request step':
+      tsw = static_cast<const TestStepWait*>(a_testCase->getStep(a_waitForRequestStepNumber));
+      const anna::DataBlock &referenceRequest = tsw->getMsgDataBlock();
+      std::string sessionIdReferenceRequest = anna::diameter::helpers::base::functions::getSessionId(referenceRequest);
+      bool thisIsAnswer = anna::diameter::codec::functions::isRequest(getMsgDataBlock());
 
-      // Check Session-Id for warning ...
-      std::string sessionIdAnswer = anna::diameter::helpers::base::functions::getSessionId(a_message);
-      std::string sessionIdRequest = anna::diameter::helpers::base::functions::getSessionId(request);
+      if (thisIsAnswer) { // is an answer: try to copy sequence information; alert about Session-Id discrepance
+        anna::diameter::HopByHop hbh = anna::diameter::codec::functions::getHopByHop(referenceRequest);
+        anna::diameter::EndToEnd ete = anna::diameter::codec::functions::getEndToEnd(referenceRequest);
 
-      if (sessionIdRequest != sessionIdAnswer) {
-        s_warn = anna::functions::asString("Sending an answer which Session-Id (%s) is different than supposed corresponding request (%s)", sessionIdAnswer.c_str(), sessionIdRequest.c_str());
-        LOGWARNING(anna::Logger::warning(s_warn, ANNA_FILE_LOCATION));
-        a_testCase->addDebugSummaryHint(s_warn);
+        // Update sequence:
+        anna::diameter::codec::functions::setHopByHop(a_message, hbh);
+        anna::diameter::codec::functions::setEndToEnd(a_message, ete);
+      }
+
+      // Session-Id substitution:
+      std::string thisSessionId = anna::diameter::helpers::base::functions::getSessionId(getMsgDataBlock());
+      if (thisSessionId != sessionIdReferenceRequest) {
+        static anna::diameter::codec::Message codecMsg;
+        codecMsg.decode(getMsgDataBlock());
+        codecMsg.getAvp("Session-Id")->getUTF8String()->setValue(sessionIdReferenceRequest);
+        a_message = codecMsg.code();
+        std::string trace = anna::functions::asString("Replacing %s Session-Id (%s) to set the corresponding request one (%s)", (thisIsAnswer ? "answer":"request"), thisSessionId.c_str(), sessionIdReferenceRequest.c_str());
+        LOGDEBUG(anna::Logger::debug(trace, ANNA_FILE_LOCATION));
+        a_testCase->addDebugSummaryHint(trace);
       }
     }
 
+    // Create comm message:
+    //msg->clearBody();
+    msg->setBody(a_message);
+
+
     if (getType() == Type::Sendxml2e) {
       anna::diameter::comm::ClientSession *usedClientSession = NULL;
 
@@ -413,12 +425,10 @@ bool TestStepSendxml::do_execute() throw() {
 
       // Detailed log:
       if(a_originHost->logEnabled()) {
-        //if (decodeMessage()) {
-          // here we decode what we encoded on programming, then we could have a validation problem but not a decoding one:
-          decodeMessage();
+        if (decodeMessage(true /* trust */)) {
           std::string detail = usedClientSession ? usedClientSession->asString() : "<null client session>"; // shouldn't happen
           a_originHost->writeLogFile(*a_messageCodec, (success ? "sent2e" : "send2eError"), detail);
-        //}
+        }
       }
     }
     else if (getType() == Type::Sendxml2c) {
@@ -449,12 +459,10 @@ bool TestStepSendxml::do_execute() throw() {
 
       // Detailed log:
       if(a_originHost->logEnabled()) {
-        //if (decodeMessage()) {
-          // here we decode what we encoded on programming, then we could have a validation problem but not a decoding one:
-          decodeMessage();
+        if (decodeMessage(true /* trust */)) {
           std::string detail = usedServerSession ? usedServerSession->asString() : "<null server session>"; // shouldn't happen
           a_originHost->writeLogFile(*a_messageCodec, (success ? "sent2c" : "send2cError"), detail);
-        //}
+        }
       }
     }