commit f21c5beb2f54784e38ce4048ae51f83ba3873702
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 22 00:35:54 2011 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 22 00:35:54 2011 -0700
tree 5c1c7fd6ec7c4df50ab11614797e5427165d6db5
parent e709f3d659cfb7a1c3df0f96f004995a1c6fa15f

Implement forgotten Timestamp and Nonce visitors and appropriate
InterestDecoding routines

Need to check whether timestamp parsing actually works

helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc

diff --git a/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc b/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
index ccb40b2..70578e7 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
@@ -24,8 +24,13 @@
 #include "ns3/ccnb-parser-dtag.h"
 #include "ns3/name-components.h"
 #include "ns3/assert.h"
+#include "ns3/nstime.h"
 
 #include "ns3/ccnx-interest-header.h"
+#include "ccnb-parser-name-components-visitor.h"
+#include "ccnb-parser-non-negative-integer-visitor.h"
+#include "ccnb-parser-timestamp-visitor.h"
+#include "ccnb-parser-nonce-visitor.h"
 
 #include <boost/foreach.hpp>
 
@@ -41,6 +46,8 @@
 
   static NonNegativeIntegerVisitor nonNegativeIntegerVisitor;
   static NameComponentsVisitor     nameComponentsVisitor;
+  static TimestampVisitor          timestampVisitor;
+  static NonceVisitor              nonceVisitor;
   
   CcnxInterestHeader &interest = boost::any_cast<CcnxInterestHeader&> (param);
   
@@ -127,13 +134,21 @@
       if (n.m_nestedTags.size()!=1) // should be exactly one UDATA inside this tag
         throw CcnbDecodingException ();
 
-      /// \todo Decode InterestLifetime
+      interest.SetInterestLifetime (
+               boost::any_cast<Time> (
+                                          (*n.m_nestedTags.begin())->accept(
+                                                                           timestampVisitor
+                                                                           )));
       break;
     case CCN_DTAG_Nonce:
       if (n.m_nestedTags.size()!=1) // should be exactly one UDATA inside this tag
         throw CcnbDecodingException ();
 
-      /// \todo Decode Nonce
+      interest.SetNonce (
+               boost::any_cast<uint32_t> (
+                                          (*n.m_nestedTags.begin())->accept(
+                                                                           nonceVisitor
+                                                                           )));
       break;
     }
 }