X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FLauncher.cpp;h=710ebfe9965d230540cd87bf3b7d02a0bd9dc75b;hb=6f990d26c49e6f5bbb31cb1a2a47615918b6c339;hp=e4ea4ca347d1309e31c678940946b94ccbcafdc0;hpb=5f094136b1817b5c4d14dbcc33c9819a8569cd1e;p=anna.git diff --git a/example/diameter/launcher/Launcher.cpp b/example/diameter/launcher/Launcher.cpp index e4ea4ca..710ebfe 100644 --- a/example/diameter/launcher/Launcher.cpp +++ b/example/diameter/launcher/Launcher.cpp @@ -14,6 +14,7 @@ #include #include #include +#include // Process #include "Launcher.hpp" @@ -21,7 +22,7 @@ #define SIGUSR2_TASKS_INPUT_FILENAME "./sigusr2.tasks.input" #define SIGUSR2_TASKS_OUTPUT_FILENAME "./sigusr2.tasks.output" - +#define DIAMETER_CODEC_ENGINE_NAME_PREFIX "MyCodecEngine" Launcher::Launcher() : anna::comm::Application("launcher", "DiameterLauncher", "1.1"), a_communicator(NULL) { a_myDiameterEngine = new MyDiameterEngine(); @@ -57,16 +58,7 @@ void Launcher::releaseCommMessage(anna::diameter::comm::Message *msg) throw() { 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 // ::= < Diameter Header: 257, REQ > // { Origin-Host } 264 diameterIdentity @@ -78,7 +70,7 @@ void Launcher::baseProtocolSetupAsClient(void) throw(anna::RuntimeException) { // * [ 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(); @@ -110,7 +102,7 @@ void Launcher::baseProtocolSetupAsClient(void) throw(anna::RuntimeException) { // ::= < Diameter Header: 280, REQ > // { Origin-Host } // { Origin-Realm } - anna::diameter::codec::Message diameterDWR; + anna::diameter::codec::Message diameterDWR(codecEngine); loadingError = false; try { @@ -128,77 +120,14 @@ void Launcher::baseProtocolSetupAsClient(void) throw(anna::RuntimeException) { diameterDWR.addAvp(anna::diameter::helpers::base::AVPID__Origin_Realm)->getDiameterIdentity()->setValue(OR); } -////////////////////////// -// IDEM FOR CEA AND DWA // -////////////////////////// -// // Build 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|" -// 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 -// // ::= < 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); @@ -281,7 +210,7 @@ void Launcher::checkTimeMeasure(const char * commandLineParameter, bool optional if(anna::functions::isLike("^[0-9]+$", parameter)) { // para incluir numeros decimales: ^[0-9]+(.[0-9]+)?$ int msecs = cl.getIntegerValue(commandLineParameter); - if(msecs > a_timeEngine->getMaxTimeout()) { + if(msecs > a_timeEngine->getMaxTimeout()) { // 600000 ms std::string msg = "Commandline parameter '"; msg += commandLineParameter; msg += "' is greater than allowed max timeout for timming engine: "; @@ -289,6 +218,13 @@ void Launcher::checkTimeMeasure(const char * commandLineParameter, bool optional throw RuntimeException(msg, ANNA_FILE_LOCATION); } + if(msecs > 300000) { + std::string msg = "Commandline parameter '"; + msg += commandLineParameter; + msg += "' is perhaps very big (over 5 minutes). Take into account memory consumption issues."; + LOGWARNING(anna::Logger::warning(msg, ANNA_FILE_LOCATION)); + } + if(msecs <= a_timeEngine->getResolution()) { std::string msg = "Commandline parameter '"; msg += commandLineParameter; @@ -319,6 +255,7 @@ void Launcher::startDiameterServer(int diameterServerSessions) throw(anna::Runti //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->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"); @@ -334,7 +271,7 @@ throw(anna::RuntimeException) { // if (cl.exists ("clone")) // workMode = anna::comm::Communicator::WorkMode::Clone; a_communicator = new MyCommunicator(workMode); - a_timeEngine = new anna::timex::Engine((anna::Millisecond)300000, (anna::Millisecond)150); + a_timeEngine = new anna::timex::Engine((anna::Millisecond)600000, (anna::Millisecond)150); // Counters record procedure: anna::Millisecond cntRecordPeriod = (anna::Millisecond)300000; // ms @@ -359,13 +296,85 @@ throw(anna::RuntimeException) { a_start_time.setNow(); // Statistics: anna::statistics::Engine::instantiate().enable(); + + // Checking command line parameters + if(cl.exists("sessionBasedModelsClientSocketSelection")) { + std::string type = cl.getValue("sessionBasedModelsClientSocketSelection"); + + if((type != "SessionIdHighPart") && (type != "SessionIdOptionalPart") && (type != "RoundRobin")) { + throw anna::RuntimeException("Commandline option '-sessionBasedModelsClientSocketSelection' only accepts 'SessionIdHighPart'/'SessionIdOptionalPart'/'RoundRobin' as parameter values", ANNA_FILE_LOCATION); + } + } + + // Tracing: + if(cl.exists("trace")) + anna::Logger::setLevel(anna::Logger::asLevel(cl.getValue("trace"))); + + LOGINFORMATION( + // Help on startup traces: + anna::Logger::information(help(), ANNA_FILE_LOCATION); + // Test messages dtd: + std::string msg = "\n ------------- TESTMESSAGES DTD -------------\n"; + msg += anna::diameter::codec::MessageDTD; + anna::Logger::information(msg, ANNA_FILE_LOCATION); + ); + + // HTTP Server: + if(cl.exists("httpServer")) { + anna::comm::Network& network = anna::comm::Network::instantiate(); + std::string address; + int port; + anna::functions::getAddressAndPortFromSocketLiteral(cl.getValue("httpServer"), address, port); + //const anna::comm::Device* device = network.find(Device::asAddress(address)); // here provide IP + const anna::comm::Device* device = *((network.resolve(address)->device_begin())); // trick to solve + a_httpServerSocket = new anna::comm::ServerSocket(anna::comm::INetAddress(device, port), cl.exists("httpServerShared") /* shared bind */, &anna::http::Transport::getFactory()); + } + + // Stack: + a_codecEngine = new anna::diameter::codec::Engine(DIAMETER_CODEC_ENGINE_NAME_PREFIX); + anna::diameter::stack::Engine &stackEngine = anna::diameter::stack::Engine::instantiate(); + anna::diameter::stack::Dictionary * d = stackEngine.createDictionary(0 /* stack id; its value don't mind, is not used (ADL is monostack) */); + // Analyze comma-separated list: + anna::Tokenizer lst; + std::string dictionaryParameter = cl.getValue("dictionary"); + lst.apply(dictionaryParameter, ","); + + if(lst.size() >= 1) { // always true (at least one, because -dictionary is mandatory) + anna::Tokenizer::const_iterator tok_min(lst.begin()); + anna::Tokenizer::const_iterator tok_max(lst.end()); + anna::Tokenizer::const_iterator tok_iter; + std::string pathFile; + d->allowUpdates(); + + for(tok_iter = tok_min; tok_iter != tok_max; tok_iter++) { + pathFile = anna::Tokenizer::data(tok_iter); + d->load(pathFile); + } + } + + getCodecEngine()->setDictionary(d); // XXXX esto cambiara... + LOGDEBUG(anna::Logger::debug(getCodecEngine()->asString(), ANNA_FILE_LOCATION)); + + if(lst.size() > 1) { + std::string all_in_one = "./dictionary-all-in-one.xml"; + std::ofstream out(all_in_one.c_str(), std::ifstream::out); + std::string buffer = d->asXMLString(); + out.write(buffer.c_str(), buffer.size()); + out.close(); + std::cout << "Written accumulated '" << all_in_one << "' (provide it next time to be more comfortable)." << std::endl; + } + /////////////////////////////// // Diameter library COUNTERS // /////////////////////////////// anna::diameter::comm::OamModule & oamDiameterComm = anna::diameter::comm::OamModule::instantiate(); oamDiameterComm.initializeCounterScope(1); // 1000 - 1999 + oamDiameterComm.enableCounters(); + oamDiameterComm.enableAlarms(); anna::diameter::codec::OamModule & oamDiameterCodec = anna::diameter::codec::OamModule::instantiate(); oamDiameterCodec.initializeCounterScope(2); // 2000 - 2999 + oamDiameterCodec.enableCounters(); + oamDiameterCodec.enableAlarms(); ///////////////// // COMM MODULE // ///////////////// @@ -463,6 +472,18 @@ throw(anna::RuntimeException) { oamDiameterCodec.registerCounter(anna::diameter::codec::OamModule::Counter::LevelValidation__FailedRuleForCardinalityMoreThanNeeded, "", 17 /*2017*/); oamDiameterCodec.registerCounter(anna::diameter::codec::OamModule::Counter::LevelValidation__FailedGenericAvpRuleForCardinalityFoundDisregardedItem, "", 18 /*2018*/); oamDiameterCodec.registerCounter(anna::diameter::codec::OamModule::Counter::LevelValidation__FoundDisregardedItemsAndGenericAVPWasNotSpecified, "", 19 /*2019*/); + /////////////////////////////////////////// + // APPLICATION MESSAGE OAM MODULE SCOPES // + /////////////////////////////////////////// + // We will register a scope per stack id registered. The counters will be dynamically registered at count method. + anna::diameter::comm::ApplicationMessageOamModule & appMsgOamModule = anna::diameter::comm::ApplicationMessageOamModule::instantiate(); + int scope_id = 3; + for (anna::diameter::stack::Engine::const_stack_iterator it = stackEngine.stack_begin(); it != stackEngine.stack_end(); it++) { + appMsgOamModule.createStackCounterScope(scope_id, it->first); + scope_id++; + } + appMsgOamModule.enableCounters(); // this special module is disabled by default (the only) + ///////////////////////////////// // Counter recorder associated // @@ -470,83 +491,16 @@ throw(anna::RuntimeException) { if(a_counterRecorderClock) { oamDiameterComm.setCounterRecorder(a_counterRecorder); oamDiameterCodec.setCounterRecorder(a_counterRecorder); + appMsgOamModule.setCounterRecorder(a_counterRecorder); a_timeEngine->activate(a_counterRecorderClock); // start clock } - // Checking command line parameters - if(cl.exists("sessionBasedModelsClientSocketSelection")) { - std::string type = cl.getValue("sessionBasedModelsClientSocketSelection"); - - if((type != "SessionIdHighPart") && (type != "SessionIdOptionalPart") && (type != "RoundRobin")) { - throw anna::RuntimeException("Commandline option '-sessionBasedModelsClientSocketSelection' only accepts 'SessionIdHighPart'/'SessionIdOptionalPart'/'RoundRobin' as parameter values", ANNA_FILE_LOCATION); - } - } - - // Tracing: - if(cl.exists("trace")) - anna::Logger::setLevel(anna::Logger::asLevel(cl.getValue("trace"))); - - LOGINFORMATION( - // Help on startup traces: - anna::Logger::information(help(), ANNA_FILE_LOCATION); - // Test messages dtd: - std::string msg = "\n ------------- TESTMESSAGES DTD -------------\n"; - msg += anna::diameter::codec::MessageDTD; - anna::Logger::information(msg, ANNA_FILE_LOCATION); - ); - - // HTTP Server: - if(cl.exists("httpServer")) { - anna::comm::Network& network = anna::comm::Network::instantiate(); - std::string address; - int port; - anna::functions::getAddressAndPortFromSocketLiteral(cl.getValue("httpServer"), address, port); - //const anna::comm::Device* device = network.find(Device::asAddress(address)); // here provide IP - const anna::comm::Device* device = *((network.resolve(address)->device_begin())); // trick to solve - a_httpServerSocket = new anna::comm::ServerSocket(anna::comm::INetAddress(device, port), cl.exists("httpServerShared") /* shared bind */, &anna::http::Transport::getFactory()); - } - - // Stack: - anna::diameter::codec::Engine *codecEngine = new anna::diameter::codec::Engine(); - anna::diameter::stack::Engine &stackEngine = anna::diameter::stack::Engine::instantiate(); - anna::diameter::stack::Dictionary * d = stackEngine.createDictionary(0 /* stack id; its value don't mind, is not used (ADL is monostack) */); - // Analyze comma-separated list: - anna::Tokenizer lst; - std::string dictionaryParameter = cl.getValue("dictionary"); - lst.apply(dictionaryParameter, ","); - - if(lst.size() >= 1) { // always true (at least one, because -dictionary is mandatory) - anna::Tokenizer::const_iterator tok_min(lst.begin()); - anna::Tokenizer::const_iterator tok_max(lst.end()); - anna::Tokenizer::const_iterator tok_iter; - std::string pathFile; - d->allowUpdates(); - - for(tok_iter = tok_min; tok_iter != tok_max; tok_iter++) { - pathFile = anna::Tokenizer::data(tok_iter); - d->load(pathFile); - } - } - - codecEngine->setDictionary(d); - LOGDEBUG(anna::Logger::debug(codecEngine->asString(), ANNA_FILE_LOCATION)); - - if(lst.size() > 1) { - std::string all_in_one = "./dictionary-all-in-one.xml"; - std::ofstream out(all_in_one.c_str(), std::ifstream::out); - std::string buffer = d->asXMLString(); - out.write(buffer.c_str(), buffer.size()); - out.close(); - std::cout << "Written accumulated '" << all_in_one << "' (provide it next time to be more comfortable)." << std::endl; - } - - // 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")) { - codecEngine->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Always); - codecEngine->setValidationDepth(anna::diameter::codec::Engine::ValidationDepth::Complete); + getCodecEngine()->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Always); // XXXXXXXXXXXXXXXXXXXXXXXXX + getCodecEngine()->setValidationDepth(anna::diameter::codec::Engine::ValidationDepth::Complete); } // Fix mode @@ -558,10 +512,10 @@ throw(anna::RuntimeException) { 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)); - codecEngine->setFixMode(fm); + getCodecEngine()->setFixMode(fm); // XXXXXXXXXXXXXXXXXXXXXXX } - codecEngine->ignoreFlagsOnValidation(cl.exists("ignoreFlags")); + getCodecEngine()->ignoreFlagsOnValidation(cl.exists("ignoreFlags")); // XXXXXXXXXXXXXXXXXXXXXXX // Diameter Server: if(cl.exists("diameterServer")) @@ -612,12 +566,13 @@ throw(anna::RuntimeException) { 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->setCodecEngine(getCodecEngine()); // XXXXXXXXXXXXXXXXXXXXXXX a_entity->bind(); } } @@ -874,7 +829,7 @@ bool Launcher::sendBurstMessage(bool anyway) throw() { anna::diameter::comm::Server *usedServer = a_entity->getLastUsedResource(); anna::diameter::comm::ClientSession *usedClientSession = usedServer ? usedServer->getLastUsedResource() : NULL; std::string detail = usedClientSession ? usedClientSession->asString() : ""; // 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; @@ -888,7 +843,7 @@ std::string Launcher::lookBurst(int order) const throw() { 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(); } @@ -911,9 +866,9 @@ std::string Launcher::gotoBurst(int order) throw() { } void Launcher::resetCounters() throw() { - // Diameter::comm module: - anna::diameter::comm::OamModule & oamDiameterComm = anna::diameter::comm::OamModule::instantiate(); - oamDiameterComm.resetCounters(); + anna::diameter::comm::OamModule::instantiate().resetCounters(); + anna::diameter::comm::ApplicationMessageOamModule::instantiate().resetCounters(); + anna::diameter::codec::OamModule::instantiate().resetCounters(); } void Launcher::signalUSR2() throw(anna::RuntimeException) { @@ -1001,21 +956,21 @@ std::string Launcher::help() const throw() { result += "\n (we will talk later about this great feature). Some of the more common parameters are:"; result += "\n"; result += "\nAs mandatory, the stack definition given through the xml dictionary:"; - result += "\n -dictionary "; + result += "\n --dictionary "; result += "\n"; result += "\nActing as a diameter server (accepting i.e. 10 connections), you would have:"; - result += "\n -diameterServer localhost:3868 -diameterServerSessions 10 -entityServerSessions 0"; + result += "\n --diameterServer localhost:3868 --diameterServerSessions 10 --entityServerSessions 0"; result += "\n"; result += "\nActing as a diameter client (launching i.e. 10 connections to each entity server), you would have:"; - result += "\n -entity 192.168.12.11:3868,192.168.12.21:3868 -entityServerSessions 10 -diameterServerSessions 0"; + result += "\n --entity 192.168.12.11:3868,192.168.12.21:3868 --entityServerSessions 10 --diameterServerSessions 0"; result += "\n"; result += "\nIf you act as a proxy or a translation agent, you need to combine both former setups, and probably"; result += "\n will need to program the answers to be replied through the operations interface. To balance the"; - result += "\n traffic at your client side you shall use '-balance' and '-sessionBasedModelsClientSocketSelection'"; + result += "\n traffic at your client side you shall use '--balance' and '--sessionBasedModelsClientSocketSelection'"; result += "\n arguments in order to define the balancing behaviour."; result += "\n"; result += "\nThe process builds automatically CER and DWR messages as a client, but you could specify your own"; - result += "\n customized ones using '-cer ' and '-dwr '."; + result += "\n customized ones using '--cer ' and '--dwr '."; result += "\nThe process builds automatically CEA and DWA messages as a server, but you could program your own"; result += "\n customized ones using operations interface."; result += "\n"; @@ -1041,9 +996,13 @@ std::string Launcher::help() const throw() { result += "\n"; result += "\ndiameterServerSessions| Updates the maximum number of accepted connections to diameter"; result += "\n server socket."; + result += "\ncontext|[target file] Application context could also be written by mean this operation,"; + result += "\n and not only through SIGUSR1. If optional path file is missing,"; + result += "\n default '/var/tmp/anna.context.' will be used."; result += "\ncollect Reset statistics and counters to start a new test stage of"; - result += "\n performance measurement. Context data is written at"; - result += "\n '/var/tmp/anna.context.' by mean 'kill -10 '."; + result += "\n performance measurement. Context data can be written at"; + result += "\n '/var/tmp/anna.context.' by mean 'kill -10 '"; + result += "\n or sending operation 'context|[target file]'."; result += "\nforceCountersRecord Forces dump to file the current counters of the process."; result += "\n"; result += "\n|[
:]|[socket id]"; @@ -1201,7 +1160,7 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons 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: @@ -1272,6 +1231,13 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons if(numParams == 2) { tok_iter++; param2 = Tokenizer::data(tok_iter); } // Operations: + if(opType == "context") { + std::string contextFile = ((numParams == 1) ? param1 : anna::functions::asString("/var/tmp/anna.context.%05d", getPid())); + writeContext(contextFile); + response_content = anna::functions::asString("Context dumped on file '%s'\n", contextFile.c_str()); + return; + } + if(opType == "code") { codecMsg.loadXML(param1); std::string hexString = anna::functions::asHexString(codecMsg.code()); @@ -1525,8 +1491,7 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons } else if (param1 == "dump") { localServer->getReactingAnswers()->dump(); } else { - anna::diameter::codec::Engine *engine = anna::functions::component (ANNA_FILE_LOCATION); - anna::diameter::codec::Message *message = engine->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); @@ -1558,8 +1523,7 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons } else if (param1 == "dump") { entity->getReactingAnswers()->dump(); } else { - anna::diameter::codec::Engine *engine = anna::functions::component (ANNA_FILE_LOCATION); - anna::diameter::codec::Message *message = engine->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); @@ -1695,9 +1659,10 @@ throw() { result->createAttribute("StartTime", a_start_time.asString()); result->createAttribute("SecondsLifeTime", anna::time::functions::lapsedMilliseconds() / 1000); // Diameter: - (anna::functions::component (ANNA_FILE_LOCATION))->asXML(result); + getCodecEngine()->asXML(result); // XXXXXXXXXXXXXXX todos los nodos ... // OAM: anna::diameter::comm::OamModule::instantiate().asXML(result); + anna::diameter::comm::ApplicationMessageOamModule::instantiate().asXML(result); anna::diameter::codec::OamModule::instantiate().asXML(result); // Statistics: anna::statistics::Engine::instantiate().asXML(result);