a_commMessages.release(msg);
}
-anna::diameter::codec::Message *Launcher::createCodecMessage() throw(anna::RuntimeException) {
- return a_codecMessages.create();
-}
-
-void Launcher::releaseCodecMessage(anna::diameter::codec::Message *msg) throw() {
- a_codecMessages.release(msg);
-}
-
-
-void Launcher::baseProtocolSetupAsClient(void) throw(anna::RuntimeException) {
+void Launcher::baseProtocolSetupAsClient(anna::diameter::codec::Engine *codecEngine) throw(anna::RuntimeException) {
// Build CER
// <CER> ::= < Diameter Header: 257, REQ >
// { Origin-Host } 264 diameterIdentity
// * [ Supported-Vendor-Id ] 265 Unsigned32
// * [ Auth-Application-Id ] 258 Unsigned32
// * [Acct-Application-Id] 259 Unsigned32
- anna::diameter::codec::Message diameterCER;
+ anna::diameter::codec::Message diameterCER(codecEngine);
int applicationId = 0 /*anna::diameter::helpers::APPID__3GPP_Rx*/; // Unsigned32
std::string OH = a_myDiameterEngine->getHost();
std::string OR = a_myDiameterEngine->getRealm();
// <DWR> ::= < Diameter Header: 280, REQ >
// { Origin-Host }
// { Origin-Realm }
- anna::diameter::codec::Message diameterDWR;
+ anna::diameter::codec::Message diameterDWR(codecEngine);
loadingError = false;
try {
diameterDWR.addAvp(anna::diameter::helpers::base::AVPID__Origin_Realm)->getDiameterIdentity()->setValue(OR);
}
-//////////////////////////
-// IDEM FOR CEA AND DWA //
-//////////////////////////
-// // Build CER
-// // <CER> ::= < Diameter Header: 257, REQ >
-// // { Origin-Host } 264 diameterIdentity
-// // { Origin-Realm } 296 idem
-// // 1* { Host-IP-Address } 257, address
-// // { Vendor-Id } 266 Unsigned32
-// // { Product-Name } 269 UTF8String
-// // [Origin-State-Id] 278 Unsigned32
-// // * [ Supported-Vendor-Id ] 265 Unsigned32
-// // * [ Auth-Application-Id ] 258 Unsigned32
-// // * [Acct-Application-Id] 259 Unsigned32
-// anna::diameter::codec::Message diameterCER;
-// int applicationId = 0 /*anna::diameter::helpers::APPID__3GPP_Rx*/; // Unsigned32
-// std::string OH = a_myDiameterEngine->getHost();
-// std::string OR = a_myDiameterEngine->getRealm();
-// std::string hostIP = anna::functions::getHostnameIP(); // Address
-// int vendorId = anna::diameter::helpers::VENDORID__tgpp; // Unsigned32
-// std::string productName = "ANNA Diameter Launcher"; // UTF8String
-// bool loadingError = false;
-//
-// try {
-// diameterCER.loadXML("cer.xml");
-// } catch (anna::RuntimeException &ex) {
-// ex.trace();
-// loadingError = true;
-// }
-//
-// if (loadingError) {
-// LOGWARNING(anna::Logger::warning("CER file not found. Get harcoded.", ANNA_FILE_LOCATION));
-// diameterCER.setId(anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request);
-// diameterCER.setApplicationId(applicationId);
-// diameterCER.addAvp(anna::diameter::helpers::base::AVPID__Origin_Host)->getDiameterIdentity()->setValue(OH);
-// diameterCER.addAvp(anna::diameter::helpers::base::AVPID__Origin_Realm)->getDiameterIdentity()->setValue(OR);
-// diameterCER.addAvp(anna::diameter::helpers::base::AVPID__Host_IP_Address)->getAddress()->fromPrintableString(hostIP.c_str()); // supported by Address class, anyway is better to provide "1|<ip address>"
-// diameterCER.addAvp(anna::diameter::helpers::base::AVPID__Vendor_Id)->getUnsigned32()->setValue(vendorId);
-// diameterCER.addAvp(anna::diameter::helpers::base::AVPID__Product_Name)->getUTF8String()->setValue(productName);
-// diameterCER.addAvp(anna::diameter::helpers::base::AVPID__Auth_Application_Id)->getUnsigned32()->setValue(applicationId);
-// }
-//
-// // Build DWR
-// // <DWR> ::= < Diameter Header: 280, REQ >
-// // { Origin-Host }
-// // { Origin-Realm }
-// anna::diameter::codec::Message diameterDWR;
-// loadingError = false;
-//
-// try {
-// diameterDWR.loadXML("dwr.xml");
-// } catch (anna::RuntimeException &ex) {
-// ex.trace();
-// loadingError = true;
-// }
-//
-// if (loadingError) {
-// LOGWARNING(anna::Logger::warning("DWR file not found. Get harcoded.", ANNA_FILE_LOCATION));
-// diameterDWR.setId(anna::diameter::helpers::base::COMMANDID__Device_Watchdog_Request);
-// diameterDWR.setApplicationId(applicationId);
-// diameterDWR.addAvp(anna::diameter::helpers::base::AVPID__Origin_Host)->getDiameterIdentity()->setValue(OH);
-// diameterDWR.addAvp(anna::diameter::helpers::base::AVPID__Origin_Realm)->getDiameterIdentity()->setValue(OR);
-// }
// Assignment for CER/DWR and CEA/DWA:
a_myDiameterEngine->setCERandDWR(diameterCER.code(), diameterDWR.code());
//a_myDiameterEngine->setCEAandDWA(diameterCEA.code(), diameterDWA.code());
}
-void Launcher::writeLogFile(const anna::DataBlock & db, const std::string &logExtension, const std::string &detail) const throw() {
+void Launcher::writeLogFile(const anna::DataBlock & db, const std::string &logExtension, const std::string &detail, anna::diameter::codec::Engine *codecEngine) const throw() {
// if (!logEnabled()) return;
- anna::diameter::codec::Message codecMsg;
+ anna::diameter::codec::Message codecMsg(codecEngine);
try { codecMsg.decode(db); } catch(anna::RuntimeException &ex) { ex.trace(); }
writeLogFile(codecMsg, logExtension, detail);
//ServerSocket *createServerSocket(const std::string & addr, int port = Session::DefaultPort, int maxConnections = -1, int category = 1, const std::string & description = "")
a_diameterLocalServer = (MyLocalServer*)(a_myDiameterEngine->createLocalServer(address, port, diameterServerSessions));
a_diameterLocalServer->setDescription("Launcher diameter local server");
- a_diameterLocalServer->setProgrammedAnswersCodecEngine(getCodecEngine());
+ a_diameterLocalServer->setCodecEngine(getCodecEngine()); // this is for automatic answers (failed-avp) XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX el del nodo correspondiente
int allowedInactivityTime = 90000; // ms
if(cl.exists("allowedInactivityTime")) allowedInactivityTime = cl.getIntegerValue("allowedInactivityTime");
}
}
- getCodecEngine()->setDictionary(d);
+ getCodecEngine()->setDictionary(d); // XXXX esto cambiara...
LOGDEBUG(anna::Logger::debug(getCodecEngine()->asString(), ANNA_FILE_LOCATION));
if(lst.size() > 1) {
// Integration (validation 'Complete' for receiving messages) and debugging (validation also before encoding: 'Always').
// If missing 'integrationAndDebugging', default behaviour at engine is: mode 'AfterDecoding', depth 'FirstError':
if(cl.exists("integrationAndDebugging")) {
- getCodecEngine()->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Always);
+ getCodecEngine()->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Always); // XXXXXXXXXXXXXXXXXXXXXXXXX
getCodecEngine()->setValidationDepth(anna::diameter::codec::Engine::ValidationDepth::Complete);
}
else if (fixMode == "Always") fm = anna::diameter::codec::Engine::FixMode::Always;
else if (fixMode == "Never") fm = anna::diameter::codec::Engine::FixMode::Never;
else LOGINFORMATION(anna::Logger::information("Unreconized command-line fix mode. Assumed default 'BeforeEncoding'", ANNA_FILE_LOCATION));
- getCodecEngine()->setFixMode(fm);
+ getCodecEngine()->setFixMode(fm); // XXXXXXXXXXXXXXXXXXXXXXX
}
- getCodecEngine()->ignoreFlagsOnValidation(cl.exists("ignoreFlags"));
+ getCodecEngine()->ignoreFlagsOnValidation(cl.exists("ignoreFlags")); // XXXXXXXXXXXXXXXXXXXXXXX
// Diameter Server:
if(cl.exists("diameterServer"))
int entityServerSessions = cl.exists("entityServerSessions") ? cl.getIntegerValue("entityServerSessions") : 1;
if(entityServerSessions > 0) {
- baseProtocolSetupAsClient(); // Same CER/CEA, DWR/DWA for all diameter servers
+ baseProtocolSetupAsClient(getCodecEngine()); // Same CER/CEA, DWR/DWA for all diameter servers XXXXXXXXXXXXXXXXXXXXXXXXX
anna::socket_v servers = anna::functions::getSocketVectorFromString(cl.getValue("entity"));
a_myDiameterEngine->setNumberOfClientSessionsPerServer(entityServerSessions);
a_entity = (MyDiameterEntity*)(a_myDiameterEngine->createEntity(servers, "Launcher diameter entity"));
a_entity->setClassCodeTimeout(anna::diameter::comm::ClassCode::Bind, ceaTimeout);
a_entity->setClassCodeTimeout(anna::diameter::comm::ClassCode::ApplicationMessage, answersTimeout);
- a_entity->setProgrammedAnswersCodecEngine(getCodecEngine());
+ a_entity->setCodecEngine(getCodecEngine()); // XXXXXXXXXXXXXXXXXXXXXXX
a_entity->bind();
}
}
anna::diameter::comm::Server *usedServer = a_entity->getLastUsedResource();
anna::diameter::comm::ClientSession *usedClientSession = usedServer ? usedServer->getLastUsedResource() : NULL;
std::string detail = usedClientSession ? usedClientSession->asString() : "<null client session>"; // esto no deberia ocurrir
- writeLogFile(msg->getBody(), (result ? "sent2e" : "send2eError"), detail);
+ writeLogFile(msg->getBody(), (result ? "sent2e" : "send2eError"), detail, getCodecEngine()); // el del nodo de trabajo
}
return result;
if(it != a_burstMessages.end()) {
// Decode
- anna::diameter::codec::Message codecMsg;
+ anna::diameter::codec::Message codecMsg(getCodecEngine()); // XXXXXXXXXXXXXXXX el del nodo de trabajo
try { codecMsg.decode((*it).second->getBody()); } catch(anna::RuntimeException &ex) { ex.trace(); }
result = codecMsg.asXMLString();
}
response_content = "Operation processed with exception. See traces\n"; // supposed
std::string result = "";
anna::DataBlock db_aux(true);
- anna::diameter::codec::Message codecMsg;
+ anna::diameter::codec::Message codecMsg(getCodecEngine()); // XXXXXXXXXXXXXX el del nodo de trabajo
///////////////////////////////////////////////////////////////////
// Simple operations without arguments:
} else if (param1 == "dump") {
localServer->getReactingAnswers()->dump();
} else {
- anna::diameter::codec::Message *message = getCodecEngine()->createMessage(param1);
+ anna::diameter::codec::Message *message = getCodecEngine()->createMessage(param1); // // XXXXXXXXXXXXXX el del nodo de trabajo
LOGDEBUG
(
anna::Logger::debug(message->asXMLString(), ANNA_FILE_LOCATION);
} else if (param1 == "dump") {
entity->getReactingAnswers()->dump();
} else {
- anna::diameter::codec::Message *message = getCodecEngine()->createMessage(param1);
+ anna::diameter::codec::Message *message = getCodecEngine()->createMessage(param1); // XXXXXXXXXXXXXX el del nodo de trabajo
LOGDEBUG
(
anna::Logger::debug(message->asXMLString(), ANNA_FILE_LOCATION);
result->createAttribute("StartTime", a_start_time.asString());
result->createAttribute("SecondsLifeTime", anna::time::functions::lapsedMilliseconds() / 1000);
// Diameter:
- getCodecEngine()->asXML(result);
+ getCodecEngine()->asXML(result); // XXXXXXXXXXXXXXX todos los nodos ...
// OAM:
anna::diameter::comm::OamModule::instantiate().asXML(result);
anna::diameter::comm::ApplicationMessageOamModule::instantiate().asXML(result);