tme example using derived format "Unsigned16" and checking 16bits overflow (specific...

All the derived formats are now outside codec::Avp, and derived over codec::tme::Avp, which are at the moment: ISDNNumber, ISDNAddress, Unsigned16.
Verified correct behaviour on derived tme::Message and tme::Avp.

diff --git a/example/diameter/tme/main.cpp b/example/diameter/tme/main.cpp
index 567cf8a..7973513 100644 (file)
--- a/example/diameter/tme/main.cpp
+++ b/example/diameter/tme/main.cpp
@@ -8,10 +8,16 @@
 #include <anna/core/core.hpp>
 #include <anna/xml/xml.hpp>
 #include <anna/diameter/stack/Engine.hpp>
-#include <anna/diameter/codec/Engine.hpp>
 #include <anna/time/functions.hpp>
 #include <anna/time/Date.hpp>
 
+#include <anna/diameter/codec/tme/Engine.hpp>
+#include <anna/diameter/codec/tme/Message.hpp>
+
+
+typedef anna::diameter::codec::tme::Message tmeMessage;
+typedef anna::diameter::codec::tme::Avp tmeAvp;
+
 
 void _exit(const std::string & msg) {
    std::cout << std::endl << msg << std::endl;
@@ -37,8 +43,9 @@ int main(int argc, char** argv) {
   Logger::initialize("tme", new TraceWriter("file.trace", 2048000));
   anna::time::functions::initialize(); // before application instantiation (it have a anna::time object)
   anna::time::functions::setControlPoint(); // start control point (application lifetime)
-  anna::diameter::stack::Engine & engine = anna::diameter::stack::Engine::instantiate();
+  anna::diameter::stack::Engine & stackEngine = anna::diameter::stack::Engine::instantiate();
   anna::diameter::stack::Dictionary *dictionary;
+  anna::diameter::codec::tme::Engine *codecEngine = new anna::diameter::codec::tme::Engine();
   std::string exec = argv[0];
   std::string param = argv[1] ? argv[1] : "";
 
@@ -67,62 +74,42 @@ int main(int argc, char** argv) {
   }
 
   try {
-    dictionary = engine.createDictionary(0 /* general unique stack id */);
+    dictionary = stackEngine.createDictionary(0 /* general unique stack id */);
     dictionary->allowUpdates();
     dictionary->load(param + "/avps_ietf.xml");
     dictionary->load(param + "/avps_etsi.xml");
     dictionary->load(param + "/avps_tgpp.xml");
     dictionary->load(param + "/avps_tme.xml");
     dictionary->load(param + "/commands_dccaOCS-CS_HuaweiNGIN_de-es.xml");
+    codecEngine->setDictionary(dictionary);
 
     // Trace:
-    LOGINFORMATION(Logger::information(engine.asString(), ANNA_FILE_LOCATION));
+    LOGINFORMATION(Logger::information(stackEngine.asString(), ANNA_FILE_LOCATION));
     LOGDEBUG(Logger::debug(dictionary->asString(), ANNA_FILE_LOCATION));
+    LOGDEBUG(Logger::debug(codecEngine->asString(), ANNA_FILE_LOCATION));
 
   } catch (anna::RuntimeException &ex) {
     ex.trace();
     std::cout << ex.getText() << std::endl;
   }
 
+  // Build CCA
+  tmeMessage cca;
+  cca.setId("Credit-Control-Answer");
 
-  anna::diameter::codec::Message ccr;
-  ccr.setId("Credit-Control-Request");
-
-  //LOGDEBUG(Logger::debug(ccr.asXMLString(), ANNA_FILE_LOCATION));
-/*
-
-  tmeAvp *sid = (tmeAvp*)ccr.addAvp("Session-Id");
-  tmeAvp *ohst = (tmeAvp*)ccr.addAvp("Origin-Host");
-  tmeAvp *orlm = (tmeAvp*)ccr.addAvp("Origin-Realm");
+  tmeAvp *sid = (tmeAvp*)cca.addAvp("Session-Id");
+  tmeAvp *ohst = (tmeAvp*)cca.addAvp("Origin-Host");
+  tmeAvp *orlm = (tmeAvp*)cca.addAvp("Origin-Realm");
 
   sid->getUTF8String()->setValue("grump.example.com:33041;23432;893;0AF3B81");  
   ohst->getDiameterIdentity()->setValue("c0-10-70-238-74-w5p1vepg1.vepc.ericsson.se");
   orlm->getDiameterIdentity()->setValue("vepc.ericsson.se");
-*/ 
-/*
-   <command name="Credit-Control-Request" code="272" type="Request">
-      <avprule id="Session-Id" type="Fixed"/>
-      <avprule id="Origin-Host" type="Mandatory"/>
-      <avprule id="Origin-Realm" type="Mandatory"/>
-      <avprule id="Destination-Realm" type="Mandatory"/>
-      <avprule id="Auth-Application-Id" type="Mandatory"/>
-      <avprule id="Service-Context-Id" type="Mandatory"/>
-      <avprule id="CC-Request-Type" type="Mandatory"/>
-      <avprule id="CC-Request-Number" type="Mandatory"/>
-      <avprule id="Event-Timestamp" type="Optional"/>
-      <avprule id="Subscription-Id" type="Mandatory" qual="*"/>
-      <avprule id="Termination-Cause" type="Optional"/>
-      <avprule id="Requested-Service-Unit" type="Optional"/>
-      <avprule id="Requested-Action" type="Optional"/>
-      <avprule id="Used-Service-Unit" type="Optional"/>
-      <avprule id="CC-Correlation-Id" type="Optional"/>
-      <avprule id="User-Equipment-Info" type="Optional"/>
-      <avprule id="Proxy-Info" type="Optional" qual="*"/>
-      <avprule id="Route-Record" type="Optional" qual="*"/>
-      <avprule id="Service-Information" type="Optional"/>
-      <avprule id="AVP" type="Optional" qual="*"/>
-   </command>
+  int inRange = 65535;
+  int outRange = inRange + 1;
+  //((tmeAvp*)cca.addAvp("CS-Result-Code"))->getUnsigned16()->setValue(inRange);
+  ((tmeAvp*)cca.addAvp("CS-Result-Code"))->getUnsigned16()->setValue(outRange); // WILL BE 0 !!
 
+/*
    <command name="Credit-Control-Answer" code="272" type="Answer">
       <avprule id="Session-Id" type="Fixed"/>
       <avprule id="Result-Code" type="Mandatory"/>
@@ -149,7 +136,8 @@ int main(int argc, char** argv) {
       <avprule id="AVP" type="Optional" qual="*"/>
    </command>
 */
+   LOGDEBUG(Logger::debug(cca.asXMLString(), ANNA_FILE_LOCATION));
 
-   _exit("Open 'file.trace' in order to see the stacks loaded");
+   _exit("Open 'file.trace' in order to see traces");
 }