Fix type: end-to-end instead of end-by-end

[anna.git] / source / diameter / codec / Message.cpp

diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp
index 6593dd4..0b4d802 100644 (file)
--- a/source/diameter/codec/Message.cpp
+++ b/source/diameter/codec/Message.cpp
@@ -84,7 +84,12 @@ Message::~Message() {
 //------------------------------------------------------------------------------
 void Message::setEngine(Engine *engine) throw() {
 
-  if (a_engine && engine != a_engine) {
+  if (!engine) {
+    LOGWARNING(anna::Logger::warning("Ignored: you must assign a valid codec engine. If you want to set NULL engine, clear the message", ANNA_FILE_LOCATION));
+    return;
+  }
+
+  if (a_engine && (engine != a_engine)) {
     LOGWARNING(anna::Logger::warning("Ignored: it is not a good practice to change the codec engine once assigned. Clear the message first to set the engine again.", ANNA_FILE_LOCATION));
     return;
   }
@@ -145,7 +150,9 @@ bool Message::flagsOK(int &rc) const throw() {
   const stack::Command *stackCommand = getStackCommand();
 
   if(!stackCommand) {
-    anna::Logger::error("Impossible to decide if flags are correct because stack command is not identified. Assume flags ok", ANNA_FILE_LOCATION);
+    std::string msg = "Impossible to decide if flags are correct because stack command is not identified. Assume flags ok for Message ";
+    msg += anna::diameter::functions::commandIdAsPairString(a_id);
+    anna::Logger::error(msg, ANNA_FILE_LOCATION);
     //rc = helpers::base::AVPVALUES__Result_Code::?????;
     return true;
   };
@@ -160,12 +167,16 @@ bool Message::flagsOK(int &rc) const throw() {
   if(stackCommand->isRequest() != isRequest()) ok = false;  // en teoria es imposible salir por aqui: blindado en la dtd
 
   if(isRequest() && errorBit()) {
-    anna::Logger::error("E(rror) bit is not allowed at diameter requests", ANNA_FILE_LOCATION);
+    std::string msg = "E(rror) bit is not allowed at diameter requests as ";
+    msg += stackCommand->getName();
+    anna::Logger::error(msg, ANNA_FILE_LOCATION);
     ok = false;
   }
 
   if(isAnswer() && potentiallyReTransmittedMessageBit()) {
-    anna::Logger::error("T(Potentially re-transmitted message) bit is not allowed at diameter answers", ANNA_FILE_LOCATION);
+    std::string msg = "T(Potentially re-transmitted message) bit is not allowed at diameter answers as ";
+    msg += stackCommand->getName();
+    anna::Logger::error(msg, ANNA_FILE_LOCATION);
     ok = false;
   }
 
@@ -180,7 +191,9 @@ bool Message::flagsOK(int &rc) const throw() {
   //      is set to one (1) or the bits in the Diameter header are set
   //      incorrectly.
   if((a_flags & 0x0f) != 0x00) {
-    anna::Logger::error("Any (or more than one) of the reserved message flags bit has been activated. Reserved bits must be null", ANNA_FILE_LOCATION);
+    std::string msg = "Any (or more than one) of the reserved message flags bit has been activated. Reserved bits must be null. Message is ";
+    msg += stackCommand->getName();
+    anna::Logger::error(msg, ANNA_FILE_LOCATION);
     rc = helpers::base::AVPVALUES__Result_Code::DIAMETER_INVALID_BIT_IN_HEADER;
     return false;
   }
@@ -759,7 +772,7 @@ void Message::loadXML(const std::string &xmlPathFile) throw(anna::RuntimeExcepti
 //----------------------------------------------------------- Message::fromXML()
 //------------------------------------------------------------------------------
 void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeException) {
-  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
   const anna::xml::Attribute *version, *name, *code, *flags, *pbit, *ebit, *tbit, *appid, *hbh, *ete;
   version = messageNode->getAttribute("version", false /* no exception */);
   name = messageNode->getAttribute("name", false /* no exception */);
@@ -770,7 +783,7 @@ void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeExc
   tbit = messageNode->getAttribute("t-bit", false /* no exception */);
   appid = messageNode->getAttribute("application-id"); // required
   hbh = messageNode->getAttribute("hop-by-hop-id", false /* no exception */);
-  ete = messageNode->getAttribute("end-by-end-id", false /* no exception */);
+  ete = messageNode->getAttribute("end-to-end-id", false /* no exception */);
   int i_aux;
   unsigned int u_aux;
 
@@ -937,7 +950,7 @@ void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeExc
 //------------------------------------------------------------- Message::asXML()
 //------------------------------------------------------------------------------
 anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() {
-  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+  // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
   anna::xml::Node* result = parent->createChild("message");
   // Dictionary stack command:
   const stack::Command *stackCommand = getStackCommand();
@@ -959,7 +972,7 @@ anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() {
 
   result->createAttribute("application-id", anna::functions::asString(a_applicationId));
   result->createAttribute("hop-by-hop-id", anna::functions::asString(a_hopByHop));
-  result->createAttribute("end-by-end-id", anna::functions::asString(a_endToEnd));
+  result->createAttribute("end-to-end-id", anna::functions::asString(a_endToEnd));
 
   // Avps:
   for(const_avp_iterator it = avp_begin(); it != avp_end(); it++) {