X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fmain.cpp;h=38a6b1dd3368f2173d99dd92347233a756435c03;hb=93b27b64c8408926b83b4eec78594548bb2ea953;hp=2916704fbbf791e6966c8d0c9cd16e985fc6ea65;hpb=4456556fc4cd3d24eab8d555acceae339d476c5b;p=anna.git diff --git a/example/diameter/launcher/main.cpp b/example/diameter/launcher/main.cpp index 2916704..38a6b1d 100644 --- a/example/diameter/launcher/main.cpp +++ b/example/diameter/launcher/main.cpp @@ -42,6 +42,7 @@ #include #include +#include #include @@ -101,12 +102,78 @@ anna::diameter::comm::Message G_commMsg; anna::diameter::codec::Message G_codecMsg, G_codecAnsMsg; anna::Recycler G_commMessages; // create on requests forwards without programmed answer / release in answers forward - // Auxiliary resources for answers programming -typedef std::map < int /* message code */, anna::diameter::codec::Message* > reacting_answers_container; -typedef std::map < int /* message code */, anna::diameter::codec::Message* >::iterator reacting_answers_iterator; -typedef std::map < int /* message code */, anna::diameter::codec::Message* >::const_iterator reacting_answers_const_iterator; -reacting_answers_container G_reactingAnswers2C, G_reactingAnswers2E; +class ProgrammedAnswers { + +typedef std::deque codec_messages_deque; +typedef std::deque::iterator codec_messages_deque_iterator; +typedef std::deque::const_iterator codec_messages_deque_const_iterator; +typedef std::map < int /* message code */, codec_messages_deque* > reacting_answers_container; +typedef std::map < int /* message code */, codec_messages_deque* >::iterator reacting_answers_iterator; +typedef std::map < int /* message code */, codec_messages_deque* >::const_iterator reacting_answers_const_iterator; + + reacting_answers_container a_deques; + + public: + ProgrammedAnswers() {}; + ~ProgrammedAnswers() { + for (reacting_answers_const_iterator it = a_deques.begin(); it != a_deques.end(); it++) { + anna::diameter::codec::Engine *engine = anna::functions::component (ANNA_FILE_LOCATION); + engine->releaseMessage(*(it->second->begin())); + delete(it->second); + } + } + + void addMessage(int code, anna::diameter::codec::Message *message) throw() { + reacting_answers_const_iterator it = a_deques.find(code); + if (it != a_deques.end()) { + it->second->push_back(message); + } + else { + codec_messages_deque *deque = new codec_messages_deque; + a_deques[code] = deque; + deque->push_back(message); + } + } + + anna::diameter::codec::Message* getMessage(int code) const throw() { //get the front message (begin()), returns NULL if deque is empty + anna::diameter::codec::Message *result = NULL; + reacting_answers_const_iterator it = a_deques.find(code); + if (it != a_deques.end()) { + if (!it->second->empty()) result = *(it->second->begin()); + } + return result; + } + + void nextMessage(int code) throw() { //pops the deque and release the message (when deque is not empty: deque::empty) + reacting_answers_const_iterator it = a_deques.find(code); + if (it != a_deques.end()) { + if (!it->second->empty()) { + anna::diameter::codec::Engine *engine = anna::functions::component (ANNA_FILE_LOCATION); + engine->releaseMessage(*(it->second->begin())); + it->second->pop_front(); + } + } + } + + std::string asString() const throw() { + std::string result = "No ocurrences found\n\n"; + if(a_deques.size() != 0) { + for(reacting_answers_const_iterator it = a_deques.begin(); it != a_deques.end(); it++) { + result += "Answer code .............................................................. "; + result += anna::functions::asString(it->first); result += "\n"; + for(codec_messages_deque_const_iterator itm = it->second->begin(); itm != it->second->end(); itm++) { + result += (*itm)->asXMLString(); + result += "\n"; + } + result += "\n"; + } + } + return result; + } +}; + +ProgrammedAnswers G_reactingAnswers2C, G_reactingAnswers2E; @@ -330,8 +397,6 @@ public: void resetCounters() throw(); void signalUSR2() throw(anna::RuntimeException); std::string help() const throw(); - std::string programmedAnswers2e() const throw(); - std::string programmedAnswers2c() const throw(); // helpers bool getDataBlockFromHexFile(const std::string &pathfile, anna::DataBlock &db) const throw(); @@ -768,7 +833,7 @@ std::string Launcher::help() const throw() { result += "\n"; result += "\nAnswer programming in hexadecimal is not really neccessary (you could use send primitives) and also"; result += "\nis intended to be used with decoded messages in order to replace things like hop by hop, end to end,"; - result += "\nsubscriber id, session id, etc."; + result += "\nsubscriber id, session id, etc. Anyway you could use 'decode' operation and then program the xml created."; result += "\n"; result += "\nIf a request is received, answer map (built with 'answerxml<[2c] or 2e>' operations) will be"; result += "\n checked to find a corresponding programmed answer to be replied(*). If no ocurrence is found,"; @@ -871,39 +936,6 @@ std::string Launcher::help() const throw() { } -std::string Launcher::programmedAnswers2c() const throw() { - std::string result = "\n"; - result += "\n ------------- CURRENT PROGRAMMED ANSWERS TO CLIENT -------------\n\n"; - - if(G_reactingAnswers2C.size() == 0) { - result += "No ocurrences found\n\n"; - } else { - for(reacting_answers_const_iterator it = G_reactingAnswers2C.begin(); it != G_reactingAnswers2C.end(); it++) { - result += (*it).second->asXMLString(); - result += "\n\n"; - } - } - - return result; -} - - -std::string Launcher::programmedAnswers2e() const throw() { - std::string result = "\n"; - result += "\n\n ------------- CURRENT PROGRAMMED ANSWERS TO ENTITY -------------\n\n"; - - if(G_reactingAnswers2E.size() == 0) { - result += "No ocurrences found\n\n"; - } else { - for(reacting_answers_const_iterator it = G_reactingAnswers2E.begin(); it != G_reactingAnswers2E.end(); it++) { - result += (*it).second->asXMLString(); - result += "\n\n"; - } - } - - return result; -} - void MyCommunicator::prepareAnswer(anna::diameter::codec::Message *answer, const anna::DataBlock &request) const throw() { // Sequence values (hop-by-hop and end-to-end), session-id and subscription-id avps, are mirrored to the peer which sent the request. // If user wants to test a specific answer without changing it, use send operations better than programming. @@ -1477,42 +1509,39 @@ throw(anna::RuntimeException) { // Stack: anna::diameter::codec::Engine *codecEngine = new anna::diameter::codec::Engine(); anna::diameter::stack::Engine &stackEngine = anna::diameter::stack::Engine::instantiate(); - - try { - anna::diameter::stack::Dictionary * d = stackEngine.createDictionary(0 /* stack id */); - // 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); - } + 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)); + 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, 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; - } - } catch(anna::RuntimeException &ex) { - ex.trace(); + 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")) { @@ -2002,16 +2031,12 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons throw anna::RuntimeException("Cannot program diameter requests. Answer type must be provided", ANNA_FILE_LOCATION); int code = message->getId().first; - reacting_answers_const_iterator it = G_reactingAnswers2C.find(code); - - if(it != G_reactingAnswers2C.end()) { // found: replace - LOGDEBUG(anna::Logger::debug("Replacing formerly programed answer...", ANNA_FILE_LOCATION)); - engine->releaseMessage((*it).second); - } - - G_reactingAnswers2C[code] = message; + LOGDEBUG(anna::Logger::debug("Adding a new programed 'answer to client' to the deque...", ANNA_FILE_LOCATION)); + G_reactingAnswers2C.addMessage(code, message); } else { // answers query on stdout - std::cout << programmedAnswers2c() << std::endl; + std::cout << std::endl << std::endl; + std::cout << " ------------- CURRENT PROGRAMMED ANSWERS TO CLIENT -------------\n\n"; + std::cout << G_reactingAnswers2C.asString() << std::endl; response_content = "Programmed answers dumped on stdout\n"; return; } @@ -2033,16 +2058,12 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons throw anna::RuntimeException("Cannot program diameter requests. Answer type must be provided", ANNA_FILE_LOCATION); int code = message->getId().first; - reacting_answers_const_iterator it = G_reactingAnswers2E.find(code); - - if(it != G_reactingAnswers2E.end()) { // found: replace - LOGDEBUG(anna::Logger::debug("Replacing formerly programed answer...", ANNA_FILE_LOCATION)); - engine->releaseMessage((*it).second); - } - - G_reactingAnswers2E[code] = message; + LOGDEBUG(anna::Logger::debug("Adding a new programed 'answer to entity' to the deque...", ANNA_FILE_LOCATION)); + G_reactingAnswers2E.addMessage(code, message); } else { // answers query on stdout - std::cout << programmedAnswers2e() << std::endl; + std::cout << std::endl << std::endl; + std::cout << " ------------- CURRENT PROGRAMMED ANSWERS TO ENTITY -------------\n\n"; + std::cout << G_reactingAnswers2E.asString() << std::endl; response_content = "Programmed answers dumped on stdout\n"; return; } @@ -2187,10 +2208,8 @@ throw(anna::RuntimeException) { // Lookup reacting answers list: int code = cid.first; - reacting_answers_const_iterator it = G_reactingAnswers2E.find(code); - - if(it != G_reactingAnswers2E.end()) { - anna::diameter::codec::Message *answer_message = (*it).second; + anna::diameter::codec::Message *answer_message = G_reactingAnswers2E.getMessage(code); + if (answer_message) { // Prepare answer: my_app.getCommunicator()->prepareAnswer(answer_message, message); @@ -2204,26 +2223,38 @@ throw(anna::RuntimeException) { if(my_app.logEnabled()) my_app.writeLogFile(*answer_message, "send2eError", clientSession->asString()); } - } else { // not found: forward to client (if exists) - // Forward to client: - anna::diameter::comm::LocalServer *localServer = my_app.getDiameterLocalServer(); - if(localServer && (cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) /* don't forward CER */) { - try { - anna::diameter::comm::Message *msg = G_commMessages.create(); - msg->setBody(message); - msg->setRequestClientSessionKey(clientSession->getKey()); - bool success = localServer->send(msg); + // Pop front the reacting answer: + G_reactingAnswers2E.nextMessage(code); + return; + } - // Detailed log: - if(my_app.logEnabled()) { - anna::diameter::comm::ServerSession *usedServerSession = localServer->getLastUsedResource(); - std::string detail = usedServerSession ? usedServerSession->asString() : ""; // esto no deberia ocurrir - my_app.writeLogFile(message, (success ? "fwd2c" : "fwd2cError"), detail); - } - } catch(anna::RuntimeException &ex) { - ex.trace(); + LOGDEBUG + ( + std::string msg = "No answers programmed (maybe sold out) for request coming from entity: "; + msg += anna::diameter::functions::commandIdAsPairString(cid); + anna::Logger::debug(msg, ANNA_FILE_LOCATION); + ); + + // not found: forward to client (if exists) + // Forward to client: + anna::diameter::comm::LocalServer *localServer = my_app.getDiameterLocalServer(); + + if(localServer && (cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) /* don't forward CER */) { + try { + anna::diameter::comm::Message *msg = G_commMessages.create(); + msg->setBody(message); + msg->setRequestClientSessionKey(clientSession->getKey()); + bool success = localServer->send(msg); + + // Detailed log: + if(my_app.logEnabled()) { + anna::diameter::comm::ServerSession *usedServerSession = localServer->getLastUsedResource(); + std::string detail = usedServerSession ? usedServerSession->asString() : ""; // esto no deberia ocurrir + my_app.writeLogFile(message, (success ? "fwd2c" : "fwd2cError"), detail); } + } catch(anna::RuntimeException &ex) { + ex.trace(); } } } @@ -2367,10 +2398,10 @@ throw(anna::RuntimeException) { // If no answer is programmed and entity is configured, the failed request would be forwarded even being wrong (delegates at the end point) int code = cid.first; - reacting_answers_const_iterator it = G_reactingAnswers2C.find(code); - bool programmed = (it != G_reactingAnswers2C.end()); - anna::diameter::comm::Entity *entity = my_app.getEntity(); + anna::diameter::codec::Message *programmed_answer = G_reactingAnswers2C.getMessage(code); + bool programmed = (programmed_answer != NULL); + anna::diameter::comm::Entity *entity = my_app.getEntity(); if(!programmed && entity) { // forward condition (no programmed answer + entity available) anna::diameter::comm::Message *msg = G_commMessages.create(); msg->setBody(message); @@ -2406,7 +2437,7 @@ throw(anna::RuntimeException) { // Programmed answer only when all is ok if(analysisOK) { if(programmed) { - answer_message = (*it).second; + answer_message = programmed_answer; // Prepare answer: my_app.getCommunicator()->prepareAnswer(answer_message, message); } else return; // nothing done @@ -2431,6 +2462,9 @@ throw(anna::RuntimeException) { // Restore validation mode codecEngine->setValidationMode(backupVM); + + // Pop front the reacting answer: + if(analysisOK && programmed) G_reactingAnswers2C.nextMessage(code); } void MyLocalServer::eventResponse(const anna::diameter::comm::Response &response)