#include <anna/diameter/helpers/dcca/functions.hpp>
#include <anna/diameter/helpers/dcca/functions.hpp>
#include <anna/diameter.comm/OriginHost.hpp>
+#include <anna/diameter.comm/OriginHostManager.hpp>
// Local
#include "Procedure.hpp"
}
}
-void Procedure::execute(const std::string &args, std::string &response, anna::diameter::comm::OriginHost *originHost) throw(anna::RuntimeException) {
+void Procedure::execute(const std::string &args, std::string &response) throw(anna::RuntimeException) {
response = "Dynamic procedure failed to process '"; response += args; response += "': ";
anna::diameter::codec::Message ccri, ccrt;
anna::diameter::codec::Avp *ccri_sessionId, *ccrt_sessionId, *ccri_framedIPAddress, *ccrt_framedIPAddress, *ccri_msisdn, *ccri_imsi;
anna::diameter::codec::Avp *si1, *si2, *sidata1, *sidata2, *sitype1;
+ anna::diameter::codec::Avp *ccri_originHost;
///////// CCR-Initial:
ccri.loadXML(ccr_i);
// Session-Id & Framed-Ip-Address AVPs
ccri_sessionId = ccri.getAvp("Session-Id");
ccri_framedIPAddress = ccri.getAvp("Framed-IP-Address");
+ ccri_originHost = ccri.getAvp("Origin-Host");
// Subscription-Id AVPs
if (ccri.countAvp("Subscription-Id") != 2) {
char cad_framed[16];
anna::testing::TestCase *tc;
+ // Origin host manager:
+ anna::diameter::comm::OriginHostManager &ohm = anna::diameter::comm::OriginHostManager::instantiate();
+ // Assume the oh name from CCR-I (same as CCR-T):
+ std::string originHostName = ccri_originHost->getDiameterIdentity()->getValue();
+ anna::diameter::comm::OriginHost *originHost = ohm.getOriginHost(originHostName);
+
for (ll_index = 0; ll_index < ll_seq_size; ll_index++) {
// Calculate next values ////////////////////////////////////////////////////////////
}
// 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