commit 0605d26d2190f1c7567a80bc0150637bdd6bc5df
author Ilya Moiseenko <iliamo@ucla.edu> Fri Oct 28 13:00:07 2011 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Fri Oct 28 13:40:12 2011 -0700
tree f3fd1eafbc85c5f3a08cce9cd8cdb04f4886cbcf
parent 2b4e14915b5cba334d19b35f66de97de0389b548

Nonce generation bug fixed in Consumer app

apps/ccnx-consumer.cc

diff --git a/apps/ccnx-consumer.cc b/apps/ccnx-consumer.cc
index c43a05f..b25d11c 100644
--- a/apps/ccnx-consumer.cc
+++ b/apps/ccnx-consumer.cc
@@ -154,10 +154,13 @@
 {
     NS_LOG_FUNCTION_NOARGS ();
     NS_LOG_INFO ("Sending Interest at " << Simulator::Now ());
-        
-    uint32_t randomNonce = UniformVariable().GetInteger(1, std::numeric_limits<uint32_t>::max ());
+    
+    UniformVariable rand(1, std::numeric_limits<uint32_t>::max ());
+    uint32_t randomNonce = rand.GetValue();
+    
     CcnxInterestHeader interestHeader;
     interestHeader.SetNonce(randomNonce);
+    
     interestHeader.SetName(Create<CcnxNameComponents> (m_interestName));
     interestHeader.SetInterestLifetime(m_interestLifeTime);
     interestHeader.SetChildSelector(m_childSelector);
@@ -171,6 +174,9 @@
     packet->AddHeader (interestHeader);
         
     m_face->ReceiveFromApplication (packet);
+    
+    m_interestsTrace (m_face,packet);
+    
     NS_LOG_INFO("time = " << m_offTime);
     m_sendEvent = Simulator::Schedule (m_offTime, &CcnxConsumer::SendPacket, this);
 }
@@ -186,6 +192,8 @@
 {
   // do stuff
   NS_LOG_FUNCTION ("Received contentObject " << contentObject );
+    NS_LOG_INFO ("Preved!");
+  m_contentObjectsTrace (m_face,payload);
 }