Add nlohmann/json parser

[anna.git] / dynamic / launcher / gx / 00001 / Procedure.cpp

diff --git a/dynamic/launcher/gx/00001/Procedure.cpp b/dynamic/launcher/gx/00001/Procedure.cpp
index 20af42c..4bd974f 100644 (file)
--- a/dynamic/launcher/gx/00001/Procedure.cpp
+++ b/dynamic/launcher/gx/00001/Procedure.cpp
@@ -97,7 +97,7 @@ void Procedure::execute(const std::string &args, std::string &response)  throw(a
   anna::diameter::codec::Avp *ccri_originHost;
 
   ///////// CCR-Initial:
-  ccri.loadXML(ccr_i);
+  ccri.loadXMLFile(ccr_i);
 
   // Session-Id & Framed-Ip-Address AVPs
   ccri_sessionId = ccri.getAvp("Session-Id");
@@ -134,7 +134,7 @@ void Procedure::execute(const std::string &args, std::string &response)  throw(a
 
   ///////// CCR-Termination:
   if (haveTermination) {
-    ccrt.loadXML(ccr_t);
+    ccrt.loadXMLFile(ccr_t);
 
     // Session-Id & Framed-Ip-Address AVPs
     ccrt_sessionId = ccrt.getAvp("Session-Id");
@@ -262,19 +262,19 @@ void Procedure::execute(const std::string &args, std::string &response)  throw(a
     }
 
     // Step 2: sendxml2e: CCR-Initial
-    tc->addSendxml2e(ccri.code(), originHost, -1 /* 'wait for request' step number for answers */);
+    tc->addSendDiameterXml2e(ccri.code(), originHost, -1 /* 'wait for request' step number for answers */);
 
     // Step 3: waitfe: CCA with same session id
     // PARAM: 1     2            3      4          5           6             7           8          9       10         11
     //             wait<fe/fc>|[code]|[bitR]|[hopByHop]|[applicationId]|[sessionId]|[resultCode]|[msisdn]|[imsi]|[serviceContextId]
-    tc->addWait(true /* from entity */, "272", "0", "", "", sessionId, "2001", "", "", "");
+    tc->addWaitDiameter(true /* from entity */, "272", "0", "", "", sessionId, "2001", "", "", "");
 
     if (haveTermination) {
       // Step 4: sendxml2e: CCR-Termination
-      tc->addSendxml2e(ccrt.code(), originHost, -1 /* 'wait for request' step number for answers */);
+      tc->addSendDiameterXml2e(ccrt.code(), originHost, -1 /* 'wait for request' step number for answers */);
 
       // Step 5: waitfe: CCA with same session id
-      tc->addWait(true /* from entity */, "272", "0", "", "", sessionId, "2001", "", "", "");
+      tc->addWaitDiameter(true /* from entity */, "272", "0", "", "", sessionId, "2001", "", "", "");
     }
   } // loop